diff tests/test-metaedit.t @ 6179:4bcd641b7aec mercurial-5.8

test-compat: merge mercurial-5.9 into mercurial-5.8

--- a/tests/test-metaedit.t	Tue Feb 22 07:28:32 2022 +0300
+++ b/tests/test-metaedit.t	Tue Feb 22 07:51:36 2022 +0300
@@ -74,7 +74,7 @@
   $ hg metaedit -r 0 --fold
   abort: cannot fold public changesets: ea207398892e
   (see 'hg help phases' for details)
-  [10]
+  [255]
   $ hg metaedit 'desc(C) + desc(F)' --fold
   abort: cannot fold non-linear revisions (multiple roots given)
   [255]
@@ -87,9 +87,9 @@
   (587528abfffe will become unstable and new unstable changes are not allowed)
   [255]
   $ hg metaedit 'desc(A)::desc(B)' --fold --config 'experimental.evolution=createmarkers, allnewcommands'
-  abort: cannot fold changeset, as that will orphan 4 descendants
+  abort: fold will orphan 4 descendants
   (see 'hg help evolution.instability')
-  [10]
+  [255]
   $ hg metaedit --user foobar
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log --template '{rev}: {author}\n' -r 'desc(F):' --hidden