# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1650908080 -14400
# Node ID 409e332e518ab1d56d6d069073429c22b96b17ce
# Parent  4c22cffdb573459e15293945e33b68eb73c7a341# Parent  4bcd641b7aecdc022273782725b9964abd10e7f9
test-compat: merge mercurial-5.9 into mercurial-5.8

diff -r 4c22cffdb573 -r 409e332e518a tests/test-amend-patch.t
--- a/tests/test-amend-patch.t	Mon Apr 25 21:18:48 2022 +0400
+++ b/tests/test-amend-patch.t	Mon Apr 25 21:34:40 2022 +0400
@@ -655,7 +655,7 @@
   $ HGEDITOR=cat hg amend --patch
   abort: cannot amend public changesets: 36454bda1fdb
   (see 'hg help phases' for details)
-  [10]
+  [255]
 
   $ hg phase -r . --draft --force
 
diff -r 4c22cffdb573 -r 409e332e518a tests/test-amend.t
--- a/tests/test-amend.t	Mon Apr 25 21:18:48 2022 +0400
+++ b/tests/test-amend.t	Mon Apr 25 21:34:40 2022 +0400
@@ -199,16 +199,16 @@
 when rewritting an already rewritten changeset (i.e cset being rewritten will
 be the base of divergence)
   $ hg amend -m "i am gonna create divergence"
-  abort: cannot amend 9092f1db7931, as that creates content-divergence with aafaf407b00d
+  abort: amend of 9092f1db7931 creates content-divergence with aafaf407b00d
   (add --verbose for details or see 'hg help evolution.instability')
-  [10]
+  [255]
   $ hg amend -m "i am gonna create divergence" --verbose
-  abort: cannot amend 9092f1db7931, as that creates content-divergence with aafaf407b00d
-      changeset 9092f1db7931 already has a successor in changeset aafaf407b00d
+  abort: amend of 9092f1db7931 creates content-divergence with aafaf407b00d
+      changeset 9092f1db7931 already have a successors as changeset aafaf407b00d
       rewriting changeset 9092f1db7931 would create "content-divergence"
-      set experimental.evolution.allowdivergence=True to skip this check
+      set experimental.evolution.allowdivergence=True to overwrite this check
   (see 'hg help evolution.instability' for details on content-divergence)
-  [10]
+  [255]
 
 when rewritting a cset which has a predecessor with non-obsolete successor
 
@@ -229,14 +229,14 @@
 
   $ hg evolve -l
   $ hg amend -m "i am gonna create divergence"
-  abort: cannot amend f8c05838af90, as that creates content-divergence with aafaf407b00d, from 9092f1db7931
+  abort: amend of f8c05838af90 creates content-divergence with aafaf407b00d, from 9092f1db7931
   (add --verbose for details or see 'hg help evolution.instability')
-  [10]
+  [255]
   $ hg amend -m "i am gonna create divergence" --verbose
-  abort: cannot amend f8c05838af90, as that creates content-divergence with aafaf407b00d, from 9092f1db7931
-      changeset f8c05838af90 is a successor of changeset 9092f1db7931
-      changeset 9092f1db7931 already has a successor in changeset aafaf407b00d
+  abort: amend of f8c05838af90 creates content-divergence with aafaf407b00d, from 9092f1db7931
+      changeset f8c05838af90 is an evolution of changeset 9092f1db7931
+      changeset 9092f1db7931 already have a successors as changeset aafaf407b00d
       rewriting changeset f8c05838af90 would create "content-divergence"
-      set experimental.evolution.allowdivergence=True to skip this check
+      set experimental.evolution.allowdivergence=True to overwrite this check
   (see 'hg help evolution.instability' for details on content-divergence)
-  [10]
+  [255]
diff -r 4c22cffdb573 -r 409e332e518a tests/test-evolve.t
--- a/tests/test-evolve.t	Mon Apr 25 21:18:48 2022 +0400
+++ b/tests/test-evolve.t	Mon Apr 25 21:34:40 2022 +0400
@@ -156,7 +156,7 @@
   $ hg prune 1
   abort: cannot prune public changesets: 7c3bad9141dc
   (see 'hg help phases' for details)
-  [10]
+  [255]
   $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
   1 public 
 
@@ -1269,9 +1269,9 @@
   $ hg up 274b6cd0c101^
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg uncommit --all
-  abort: cannot uncommit changeset, as that will orphan 4 descendants
+  abort: uncommit will orphan 4 descendants
   (see 'hg help evolution.instability')
-  [10]
+  [255]
   $ hg up 274b6cd0c101
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg uncommit --all
@@ -1326,13 +1326,13 @@
   $ mkcommit c5_
   created new head
   $ hg prune '0ef9ff75f8e2 + f1b85956c48c'
-  abort: cannot prune changeset, as that will orphan 1 descendants
+  abort: prune will orphan 1 descendants
   (see 'hg help evolution.instability')
-  [10]
+  [255]
   $ hg prune '98e171e2f272::0d9203b74542'
-  abort: cannot prune changeset, as that will orphan 1 descendants
+  abort: prune will orphan 1 descendants
   (see 'hg help evolution.instability')
-  [10]
+  [255]
   $ hg prune '0ef9ff75f8e2::'
   3 changesets pruned
   $ glog -r "0cf3707e8971::"
diff -r 4c22cffdb573 -r 409e332e518a tests/test-fold.t
--- a/tests/test-fold.t	Mon Apr 25 21:18:48 2022 +0400
+++ b/tests/test-fold.t	Mon Apr 25 21:34:40 2022 +0400
@@ -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
 
diff -r 4c22cffdb573 -r 409e332e518a tests/test-metaedit.t
--- a/tests/test-metaedit.t	Mon Apr 25 21:18:48 2022 +0400
+++ b/tests/test-metaedit.t	Mon Apr 25 21:34:40 2022 +0400
@@ -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
diff -r 4c22cffdb573 -r 409e332e518a tests/test-pick.t
--- a/tests/test-pick.t	Mon Apr 25 21:18:48 2022 +0400
+++ b/tests/test-pick.t	Mon Apr 25 21:34:40 2022 +0400
@@ -295,7 +295,7 @@
   $ hg pick -r 7c15c05db6fa
   abort: cannot pick public changesets: 7c15c05db6fa
   (see 'hg help phases' for details)
-  [10]
+  [255]
 
   $ hg glog
   @  10:c437988de89f foo to b
diff -r 4c22cffdb573 -r 409e332e518a tests/test-prune.t
--- a/tests/test-prune.t	Mon Apr 25 21:18:48 2022 +0400
+++ b/tests/test-prune.t	Mon Apr 25 21:34:40 2022 +0400
@@ -94,7 +94,7 @@
   $ hg prune 0
   abort: cannot prune public changesets: 1f0dee641bb7
   (see 'hg help phases' for details)
-  [10]
+  [255]
   $ hg debugobsolete
   9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'}
   7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
diff -r 4c22cffdb573 -r 409e332e518a tests/test-sharing.t
--- a/tests/test-sharing.t	Mon Apr 25 21:18:48 2022 +0400
+++ b/tests/test-sharing.t	Mon Apr 25 21:34:40 2022 +0400
@@ -165,7 +165,7 @@
   $ hg amend -m 'fix bug 37'
   abort: cannot amend public changesets: 7b49f864d655
   (see 'hg help phases' for details)
-  [10]
+  [255]
 
 Figure SG05
   $ hg -R ../public shortlog -G
diff -r 4c22cffdb573 -r 409e332e518a tests/test-split.t
--- a/tests/test-split.t	Mon Apr 25 21:18:48 2022 +0400
+++ b/tests/test-split.t	Mon Apr 25 21:34:40 2022 +0400
@@ -139,7 +139,7 @@
   $ hg split --rev 'desc("_a")'
   abort: cannot split public changesets: 135f39f4bd78
   (see 'hg help phases' for details)
-  [10]
+  [255]
   $ hg phase --rev 'desc("_a")' --draft --force
 
 Split a revision specified with -r
@@ -351,9 +351,9 @@
   > evolutioncommands=split
   > EOF
   $ hg split -r "desc(split3)"
-  abort: cannot split changeset, as that will orphan 4 descendants
+  abort: split will orphan 4 descendants
   (see 'hg help evolution.instability')
-  [10]
+  [255]
 
 Changing evolution level to createmarkers
   $ echo "[experimental]" >> $HGRCPATH
diff -r 4c22cffdb573 -r 409e332e518a tests/test-touch.t
--- a/tests/test-touch.t	Mon Apr 25 21:18:48 2022 +0400
+++ b/tests/test-touch.t	Mon Apr 25 21:34:40 2022 +0400
@@ -179,7 +179,7 @@
   $ hg touch 2
   abort: cannot touch public changesets: * (glob)
   (see 'hg help phases' for details)
-  [10]
+  [255]
   $ hg touch --duplicate 2
 
 Reviving merge commit
diff -r 4c22cffdb573 -r 409e332e518a tests/test-uncommit.t
--- a/tests/test-uncommit.t	Mon Apr 25 21:18:48 2022 +0400
+++ b/tests/test-uncommit.t	Mon Apr 25 21:34:40 2022 +0400
@@ -17,7 +17,7 @@
   $ hg uncommit
   abort: cannot uncommit the null revision
   (no changeset checked out)
-  [10]
+  [255]
 
 Cannot uncommit public changeset
 
@@ -27,7 +27,7 @@
   $ hg uncommit
   abort: cannot uncommit public changesets: 07f494440405
   (see 'hg help phases' for details)
-  [10]
+  [255]
   $ hg phase --force --draft .
 
 Cannot uncommit merge