diff tests/test-fold.t @ 6063:1a13ac9ef30a mercurial-5.8

test-compat: back out test changes from 65d4e47d7f26

--- a/tests/test-fold.t	Tue Oct 12 10:40:40 2021 +0300
+++ b/tests/test-fold.t	Sun Oct 10 10:52:01 2021 +0300
@@ -47,7 +47,7 @@
   $ hg fold --exact null::
   abort: cannot fold the null revision
   (no changeset checked out)
-  [10]
+  [255]
   $ hg fold
   abort: no revisions specified
   [255]
@@ -81,7 +81,7 @@
   $ hg fold --from -r 0
   abort: cannot fold public changesets: 1ea73414a91b
   (see 'hg help phases' for details)
-  [10]
+  [255]
 
 Test actual folding
 
@@ -222,13 +222,13 @@
   > evolution = createmarkers, allnewcommands
   > EOF
   $ hg fold --from 'desc("r4")'
-  abort: cannot fold changeset, as that will orphan 1 descendants
+  abort: fold will orphan 1 descendants
   (see 'hg help evolution.instability')
-  [10]
+  [255]
   $ hg fold --from 'desc("r3")::desc("r11")'
-  abort: cannot fold changeset, as that will orphan 1 descendants
+  abort: fold will orphan 1 descendants
   (see 'hg help evolution.instability')
-  [10]
+  [255]
 
 test --user variant
 
@@ -430,9 +430,9 @@
 
   $ hg fold --exact -r 'desc("A")::desc("B")' -m 'second fold' \
   >         --config experimental.evolution.allowdivergence=no
-  abort: cannot fold 4b34ecfb0d56, as that creates content-divergence with fcfd42a7fa46
+  abort: fold of 4b34ecfb0d56 creates content-divergence with fcfd42a7fa46
   (add --verbose for details or see 'hg help evolution.instability')
-  [10]
+  [255]
 
 but if we allow divergence, this should work and should create new content-divergent changesets