Mercurial > hg

diff tests/test-audit-subrepo.t @ 46418:dc00324e80f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
errors: use StateError more in merge module Differential Revision: https://phab.mercurial-scm.org/D9912
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 29 Jan 2021 15:56:08 -0800
parents 9dc1351d0b5f
children 35f1ecd84bd0
line wrap: on
line diff
--- a/tests/test-audit-subrepo.t	Fri Jan 29 12:16:55 2021 -0800
+++ b/tests/test-audit-subrepo.t	Fri Jan 29 15:56:08 2021 -0800
@@ -323,7 +323,7 @@
   new changesets 7a2f0e59146f
   .hgsubstate: untracked file differs
   abort: untracked files in working directory differ from files in requested revision
-  [255]
+  [20]
   $ cat main5/.hg/hgrc | grep pwned
   [1]
 
@@ -623,7 +623,7 @@
   new changesets * (glob)
   .hgsubstate: untracked file differs
   abort: untracked files in working directory differ from files in requested revision
-  [255]
+  [20]
   $ ls "$FAKEHOME"
   a
   $ test -d "$FAKEHOME/.hg"
@@ -652,7 +652,7 @@
   new changesets * (glob)
   .hgsubstate: untracked file differs
   abort: untracked files in working directory differ from files in requested revision
-  [255]
+  [20]
   $ ls -A "$FAKEHOME"
   .hg
   a