# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1729859718 -14400
# Node ID 8da51e02b5d3059440cf9f8e6f7055f2941475c5
# Parent  9903ee44e6582817b8275f45b76093154141b88b# Parent  3c5966b42c2169836c781bee182de94b98348aca
test-compat: merge mercurial-5.7 into mercurial-5.6

diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-amend-patch.t
--- a/tests/test-amend-patch.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-amend-patch.t	Fri Oct 25 16:35:18 2024 +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
 
@@ -666,7 +666,7 @@
   $ hg add bar
   $ HGEDITOR=cat hg amend --patch
   abort: uncommitted changes
-  [20]
+  [255]
 
   $ hg revert --all
   forgetting bar
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-amend.t
--- a/tests/test-amend.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-amend.t	Fri Oct 25 16:35:18 2024 +0400
@@ -201,14 +201,14 @@
   $ hg amend -m "i am gonna create divergence"
   abort: cannot amend 9092f1db7931, as that 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
       rewriting changeset 9092f1db7931 would create "content-divergence"
       set experimental.evolution.allowdivergence=True to skip 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
 
@@ -231,7 +231,7 @@
   $ hg amend -m "i am gonna create divergence"
   abort: cannot amend f8c05838af90, as that 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
@@ -239,4 +239,4 @@
       rewriting changeset f8c05838af90 would create "content-divergence"
       set experimental.evolution.allowdivergence=True to skip this check
   (see 'hg help evolution.instability' for details on content-divergence)
-  [10]
+  [255]
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-discovery-obshashrange.t
--- a/tests/test-discovery-obshashrange.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-discovery-obshashrange.t	Fri Oct 25 16:35:18 2024 +0400
@@ -150,7 +150,6 @@
   cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   $ rm ../server/.hg/blackbox.log
   $ hg blackbox
-  * @0000000000000000000000000000000000000000 (*)> 0/0 cache hits/lookups in *.???? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> clone *ssh://user@dummy/server* client exited 0 after *.?? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> pull --rev 4 (glob)
   * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (5r, 3o) (glob)
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-abort-orphan.t
--- a/tests/test-evolve-abort-orphan.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-abort-orphan.t	Fri Oct 25 16:35:18 2024 +0400
@@ -60,11 +60,11 @@
 #if abortflag
   $ hg evolve --abort
   abort: no interrupted evolve to abort
-  [20]
+  [255]
 #else
   $ hg abort
   abort: no operation in progress
-  [20]
+  [255]
 #endif
 
 Testing with wrong combination of flags
@@ -111,7 +111,7 @@
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg parents
   changeset:   5:e93a9161a274
@@ -160,7 +160,7 @@
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
   $ echo foo > d
   $ hg resolve -m
   (no more unresolved files)
@@ -190,7 +190,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
 testing that interrupted evolve shows up in morestatus
   $ hg status -v
@@ -304,7 +304,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg glog
   o  9:7f8e8bd9f0b6 added c
@@ -371,7 +371,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
   $ hg glog
   o  9:7f8e8bd9f0b6 added c
   |   () draft
@@ -451,7 +451,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg glog
   o  12:1c476940790a added d
@@ -529,7 +529,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg glog
   @  5:c1f4718020e3 added b
@@ -578,7 +578,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
 We do have state files for evolve and merge before abort
 
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-abort-phasediv.t
--- a/tests/test-evolve-abort-phasediv.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-abort-phasediv.t	Fri Oct 25 16:35:18 2024 +0400
@@ -105,7 +105,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
 testing that interrupted evolve shows up in morestatus
   $ hg status -v
@@ -224,7 +224,7 @@
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg abort
   1 new phase-divergent changesets
@@ -294,7 +294,7 @@
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo watwat > c
   $ hg resolve -m
@@ -310,7 +310,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg abort
   1 new phase-divergent changesets
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-content-divergent-basic.t
--- a/tests/test-evolve-content-divergent-basic.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-content-divergent-basic.t	Fri Oct 25 16:35:18 2024 +0400
@@ -336,7 +336,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo foobar > d
   $ hg resolve -m
@@ -396,7 +396,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo watbar > d
   $ hg resolve -m
@@ -607,7 +607,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ cat > a <<EOF
   > jungle
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-content-divergent-case-A3.t
--- a/tests/test-evolve-content-divergent-case-A3.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-content-divergent-case-A3.t	Fri Oct 25 16:35:18 2024 +0400
@@ -79,7 +79,7 @@
   $ cd ../local
   $ hg pull -qu
   $ hg rebase -r 'desc(C)' -d 'desc(B)'
-  rebasing 3:928c8849ec01 tip "C"
+  rebasing 3:928c8849ec01 "C" (tip)
 
   $ cd ../other
   $ hg pull -qu
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-content-divergent-case-A4.t
--- a/tests/test-evolve-content-divergent-case-A4.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-content-divergent-case-A4.t	Fri Oct 25 16:35:18 2024 +0400
@@ -84,12 +84,12 @@
   $ cd ../local
   $ hg pull -qu
   $ hg rebase -r 'desc(D)' -d 'desc(C)'
-  rebasing 4:6a418860e87b tip "D"
+  rebasing 4:6a418860e87b "D" (tip)
 
   $ cd ../other
   $ hg pull -qu
   $ hg rebase -r 'desc(D)' -d 'desc(B)'
-  rebasing 4:6a418860e87b tip "D"
+  rebasing 4:6a418860e87b "D" (tip)
   $ hg push -q
 
   $ cd ../local
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-content-divergent-case-A5.t
--- a/tests/test-evolve-content-divergent-case-A5.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-content-divergent-case-A5.t	Fri Oct 25 16:35:18 2024 +0400
@@ -73,7 +73,7 @@
   $ cd ../local
   $ hg pull -qu
   $ hg rebase -r 'desc(C)' -d 'desc(A)'
-  rebasing 3:d90aa47aa5d3 tip "C"
+  rebasing 3:d90aa47aa5d3 "C" (tip)
 
   $ cd ../other
   $ hg pull -qu
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-content-divergent-interrupted.t
--- a/tests/test-evolve-content-divergent-interrupted.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-content-divergent-interrupted.t	Fri Oct 25 16:35:18 2024 +0400
@@ -90,7 +90,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg status -v
   M d
@@ -204,7 +204,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg evolve --abort
   2 new orphan changesets
@@ -279,7 +279,7 @@
   $ hg ci -m "added d"
 
   $ hg rebase -r . -d .^^^ --config extensions.rebase=
-  rebasing 5:f8b09dd867e5 tip "added d"
+  rebasing 5:f8b09dd867e5 "added d" (tip)
   $ echo bar > c
   $ hg add c
   $ hg amend
@@ -318,7 +318,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg evolve --abort
   evolve aborted
@@ -371,7 +371,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
 this test case is mainly to test that we hit merge conlict while merging the
 two divergent csets, so resolving this one which happened during relocation
@@ -389,7 +389,7 @@
   0 files updated, 0 files merged, 0 files removed, 2 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg evolve --abort
   evolve aborted
@@ -481,7 +481,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg evolve --stop
   stopped the interrupted evolve
@@ -508,7 +508,7 @@
 ---------------------------------------------------------------------------
 
   $ hg rebase -r . -d .^^^ --config extensions.rebase=
-  rebasing 6:9c1631e352d9 tip "added d"
+  rebasing 6:9c1631e352d9 "added d" (tip)
 
   $ hg glog
   @  7:517d4375cb72 added d
@@ -534,7 +534,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg evolve --stop
   stopped the interrupted evolve
@@ -593,7 +593,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg diff
   diff -r c7586e2a9264 a
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-content-divergent-relocation.t
--- a/tests/test-evolve-content-divergent-relocation.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-content-divergent-relocation.t	Fri Oct 25 16:35:18 2024 +0400
@@ -337,7 +337,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo watbar > y
   $ hg resolve -m
@@ -491,7 +491,7 @@
   warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg diff
   diff -r a1a5f649aad4 y
@@ -521,7 +521,7 @@
   1 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg diff
   diff -r 3ad61e93b7b0 y
@@ -654,7 +654,7 @@
 
 The first side of the divergence get rebased on top of upstream.
   $ hg rebase -r . -d 'desc("upstream")'
-  rebasing 2:898ddd4443b3 tip "divergent"
+  rebasing 2:898ddd4443b3 "divergent" (tip)
   $ hg --hidden co 2 -q
   updated to hidden changeset 898ddd4443b3
   (hidden revision '898ddd4443b3' was rewritten as: befae6138569)
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-content-divergent-stack.t
--- a/tests/test-evolve-content-divergent-stack.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-content-divergent-stack.t	Fri Oct 25 16:35:18 2024 +0400
@@ -272,7 +272,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
   $ echo c > c
   $ hg resolve -m
   (no more unresolved files)
@@ -285,7 +285,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
   $ hg diff
   diff -r 5907cbc074a0 c
   --- a/c	Thu Jan 01 00:00:00 1970 +0000
@@ -542,7 +542,7 @@
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo b > b
   $ hg resolve -m
@@ -555,7 +555,7 @@
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo b > b
   $ hg resolve -m
@@ -643,7 +643,7 @@
   4 new orphan changesets
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
 As now we have interrupted evolution of stack of content-divergent cset (when
 relocation of "divergent" also included) let's test --abort and --stop 
@@ -744,7 +744,7 @@
   4 new orphan changesets
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg evolve --stop
   2 new orphan changesets
@@ -864,7 +864,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo foo > b
   $ hg resolve -m
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-continue.t
--- a/tests/test-evolve-continue.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-continue.t	Fri Oct 25 16:35:18 2024 +0400
@@ -70,7 +70,7 @@
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo foo > d
   $ hg resolve -m
@@ -126,7 +126,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo foo > c
   $ hg resolve -m
@@ -190,7 +190,7 @@
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo bar > e
   $ hg resolve -m
@@ -232,7 +232,7 @@
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo foo > b
   $ hg resolve -m
@@ -319,7 +319,7 @@
   warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo foo > f
   $ hg resolve -m
@@ -336,7 +336,7 @@
   warning: conflicts while merging h! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo foo > h
   $ hg resolve -m
@@ -385,7 +385,7 @@
   warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo foo > g
   $ hg resolve -m
@@ -436,7 +436,7 @@
   warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
   $ echo foo > g
   $ hg resolve -m
   (no more unresolved files)
@@ -505,7 +505,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
 Status mentions file 'b' (copied from 'a') here, even though it wasn't
 affected by the evolved changeset (nor was 'a')
@@ -535,7 +535,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
   $ hg st -C
   M a
   A d
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-effectflags.t
--- a/tests/test-evolve-effectflags.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-effectflags.t	Fri Oct 25 16:35:18 2024 +0400
@@ -128,7 +128,7 @@
   $ mkcommit C0
   $ mkcommit D0
   $ hg rebase -r . -d 'desc(B0)'
-  rebasing 10:c85eff83a034 tip "D0"
+  rebasing 10:c85eff83a034 "D0" (tip)
 
 check result
 
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-inmemory.t
--- a/tests/test-evolve-inmemory.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-inmemory.t	Fri Oct 25 16:35:18 2024 +0400
@@ -70,7 +70,7 @@
   warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
   $ hg glog
   @  6:a2a0434af50b draft tip
   |  C
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-issue5966.t
--- a/tests/test-evolve-issue5966.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-issue5966.t	Fri Oct 25 16:35:18 2024 +0400
@@ -59,7 +59,7 @@
   atop:[4] apricot
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
   $ hg evolve --list
   34a690fcf6ab: banana
     orphan: 7f59f18ca4a9 (obsolete parent)
@@ -73,13 +73,13 @@
   U a
   $ hg evolve --continue
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [20]
+  [255]
 
 (even when ran twice)
 
   $ hg evolve --continue
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [20]
+  [255]
 
   $ cat a
   apricot
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-issue5967.t
--- a/tests/test-evolve-issue5967.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-issue5967.t	Fri Oct 25 16:35:18 2024 +0400
@@ -43,7 +43,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo apricot > a
   $ hg resolve --mark a
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-issue6097.t
--- a/tests/test-evolve-issue6097.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-issue6097.t	Fri Oct 25 16:35:18 2024 +0400
@@ -29,7 +29,7 @@
 Now rebase the successor of 0 on top of 1
 
   $ hg rebase -r . -d 1
-  rebasing 2:32acf8fb1b23 tip "apricot and coconut"
+  rebasing 2:32acf8fb1b23 "apricot and coconut" (tip)
   1 new orphan changesets
 
 Pruning 1 just to get it out of the way
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-obshistory-amend-then-fold.t
--- a/tests/test-evolve-obshistory-amend-then-fold.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-obshistory-amend-then-fold.t	Fri Oct 25 16:35:18 2024 +0400
@@ -352,7 +352,7 @@
       }
   ]
   $ hg update 471f378eab4c
-  abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192
+  abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(A0)'
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-obshistory-amend.t
--- a/tests/test-evolve-obshistory-amend.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-obshistory-amend.t	Fri Oct 25 16:35:18 2024 +0400
@@ -203,7 +203,7 @@
       }
   ]
   $ hg update 471f378eab4c
-  abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9
+  abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9!
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden "desc(A0)"
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-obshistory-content-divergent.t
--- a/tests/test-evolve-obshistory-content-divergent.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-obshistory-content-divergent.t	Fri Oct 25 16:35:18 2024 +0400
@@ -439,7 +439,7 @@
       }
   ]
   $ hg update 471f378eab4c
-  abort: hidden revision '471f378eab4c' has diverged
+  abort: hidden revision '471f378eab4c' has diverged!
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(A0)'
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-obshistory-fold.t
--- a/tests/test-evolve-obshistory-fold.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-obshistory-fold.t	Fri Oct 25 16:35:18 2024 +0400
@@ -289,7 +289,7 @@
       }
   ]
   $ hg update 471f378eab4c
-  abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192
+  abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(A0)'
@@ -299,7 +299,7 @@
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   $ hg update 0dec01379d3b
-  abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192
+  abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192!
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(B0)'
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-obshistory-lots-of-splits.t
--- a/tests/test-evolve-obshistory-lots-of-splits.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-obshistory-lots-of-splits.t	Fri Oct 25 16:35:18 2024 +0400
@@ -444,7 +444,7 @@
   x  de7290d8b885 (1) A0
   
   $ hg update de7290d8b885
-  abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more
+  abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more!
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'min(desc(A0))'
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-obshistory-prune.t
--- a/tests/test-evolve-obshistory-prune.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-obshistory-prune.t	Fri Oct 25 16:35:18 2024 +0400
@@ -105,7 +105,7 @@
   $ hg up 1
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg up 0dec01379d3b
-  abort: hidden revision '0dec01379d3b' is pruned
+  abort: hidden revision '0dec01379d3b' is pruned!
   (use --hidden to access hidden revisions)
   [255]
   $ hg up --hidden -r 'desc(B0)'
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-obshistory-split.t
--- a/tests/test-evolve-obshistory-split.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-obshistory-split.t	Fri Oct 25 16:35:18 2024 +0400
@@ -256,7 +256,7 @@
   x  471597cad322 (1) A0
   
   $ hg update 471597cad322
-  abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a
+  abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a!
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'min(desc(A0))'
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-orphan-merge.t
--- a/tests/test-evolve-orphan-merge.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-orphan-merge.t	Fri Oct 25 16:35:18 2024 +0400
@@ -209,7 +209,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo FOObar > c
   $ hg resolve -m
@@ -265,7 +265,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo foobar > c
   $ hg resolve -m
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-orphan-split.t
--- a/tests/test-evolve-orphan-split.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-orphan-split.t	Fri Oct 25 16:35:18 2024 +0400
@@ -177,7 +177,7 @@
       () draft
 
   $ hg rebase -r . -d 8fa14d15e168
-  rebasing 9:c0fbf8aaf6c4 tip "added a b c"
+  rebasing 9:c0fbf8aaf6c4 "added a b c" (tip)
   $ hg glog
   @  10:7f87764e5b64 added a b c
   |   () draft
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-phase-divergence.t
--- a/tests/test-evolve-phase-divergence.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-phase-divergence.t	Fri Oct 25 16:35:18 2024 +0400
@@ -570,7 +570,7 @@
 
   $ cd ../alice
   $ hg rebase -r . -d .^^^
-  rebasing 9:2352021b3785 bm tip "added x to x"
+  rebasing 9:2352021b3785 "added x to x" (bm tip)
 
   $ hg pull ../public
   pulling from ../public
@@ -699,7 +699,7 @@
   $ hg add y
   $ hg ci -m "y to y and foobar to foo"
   $ hg rebase -r . -d .^^^
-  rebasing 12:dc88f5aa9bc9 tip "y to y and foobar to foo"
+  rebasing 12:dc88f5aa9bc9 "y to y and foobar to foo" (tip)
 
   $ echo foo > y
   $ hg amend
@@ -806,7 +806,7 @@
   $ echo l > l
   $ hg ci -Aqm "added l to l"
   $ hg rebase -r . -d .^^^^
-  rebasing 17:c7c3e834e653 tip "added l to l"
+  rebasing 17:c7c3e834e653 "added l to l" (tip)
   $ echo kl > l
   $ echo foo > x
   $ hg add x
@@ -852,7 +852,7 @@
   warning: conflicts while merging x! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg diff
   diff -r ec66af49a1a6 l
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-phase.t
--- a/tests/test-evolve-phase.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-phase.t	Fri Oct 25 16:35:18 2024 +0400
@@ -97,7 +97,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg diff
   diff -r 87495ea7c9ec a
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-progress.t
--- a/tests/test-evolve-progress.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-progress.t	Fri Oct 25 16:35:18 2024 +0400
@@ -136,7 +136,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
   $ echo resolved > a
   $ hg resolve -m a
   (no more unresolved files)
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-public-content-divergent-corner-cases.t
--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Fri Oct 25 16:35:18 2024 +0400
@@ -396,7 +396,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg diff
   diff -r 155349b645be c
@@ -427,7 +427,7 @@
   1 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg sum
   parent: 5:93cd84bbdaca 
@@ -507,7 +507,7 @@
   $ node=`hg log --rev 'desc("c_E")' -T '{node}'`
   $ hg rebase -s $node -d 'desc("c_B")'
   rebasing 5:4ab2719bbab9 "c_E"
-  rebasing 6:77ccbf8d837e tip "c_F"
+  rebasing 6:77ccbf8d837e "c_F" (tip)
   $ hg phase --public tip
   $ hg rebase --hidden -s $node -d 'desc("c_C")' --config experimental.evolution.allowdivergence=yes
   rebasing 5:4ab2719bbab9 "c_E"
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-public-content-divergent-discard.t
--- a/tests/test-evolve-public-content-divergent-discard.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-public-content-divergent-discard.t	Fri Oct 25 16:35:18 2024 +0400
@@ -273,7 +273,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg diff
   diff -r f7c1071f1e7c ch
@@ -387,7 +387,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo c > c
   $ hg resolve -m
@@ -492,7 +492,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo dh > dh
   $ hg resolve -m
@@ -595,7 +595,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo c > c
   $ hg resolve -m
@@ -609,7 +609,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo dh > dh
   $ hg resolve -m
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-public-content-divergent-main.t
--- a/tests/test-evolve-public-content-divergent-main.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-public-content-divergent-main.t	Fri Oct 25 16:35:18 2024 +0400
@@ -174,7 +174,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo "I am foobar" > b
   $ hg resolve -m --tool union
@@ -361,7 +361,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg diff
   diff -r 155349b645be c
@@ -492,7 +492,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo d > d
   $ hg resolve -m
@@ -584,7 +584,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg diff
   diff -r 155349b645be c
@@ -619,7 +619,7 @@
   2 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo d > d
   $ hg resolve -m
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-stop-orphan.t
--- a/tests/test-evolve-stop-orphan.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-stop-orphan.t	Fri Oct 25 16:35:18 2024 +0400
@@ -48,7 +48,7 @@
 
   $ hg evolve --stop
   abort: no interrupted evolve to stop
-  [20]
+  [255]
 
 Testing with wrong combinations of flags
 ========================================
@@ -102,7 +102,7 @@
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg evolve --stop
   stopped the interrupted evolve
@@ -150,7 +150,7 @@
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg diff
   diff -r cb6a2ab625bb d
@@ -208,7 +208,7 @@
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
   $ echo foo > d
   $ hg resolve -m
   (no more unresolved files)
@@ -260,7 +260,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg status
   M c
@@ -300,7 +300,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo foobar > c
   $ hg resolve -m
@@ -377,7 +377,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg evolve --stop
   stopped the interrupted evolve
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-stop-phasediv.t
--- a/tests/test-evolve-stop-phasediv.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-stop-phasediv.t	Fri Oct 25 16:35:18 2024 +0400
@@ -94,7 +94,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg evolve --stop
   stopped the interrupted evolve
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-topic.t
--- a/tests/test-evolve-topic.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-topic.t	Fri Oct 25 16:35:18 2024 +0400
@@ -332,9 +332,9 @@
 different topic
 
   $ hg rebase -s 94e899639b23 -d 604c23b08613 --config extensions.rebase=
-  rebasing 16:94e899639b23 bar "add iii"
+  rebasing 16:94e899639b23 "add iii" (bar)
   1 new orphan changesets
-  rebasing 17:fed0f67a2171 bar "add jjj"
+  rebasing 17:fed0f67a2171 "add jjj" (bar)
   1 new orphan changesets
   $ hg log -Gr 42b49017ff90::
   *  21 - {bar} 573bbc059289 add jjj (draft)
@@ -422,7 +422,7 @@
   warning: conflicts while merging hhh! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
   $ echo "resolved hhh" > hhh
   $ hg resolve --mark hhh
   (no more unresolved files)
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve-wdir.t
--- a/tests/test-evolve-wdir.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve-wdir.t	Fri Oct 25 16:35:18 2024 +0400
@@ -194,7 +194,7 @@
 
 when split csets are on multiple topological branches
   $ hg rebase -r 'max(desc(c_XYZ))' -d 'desc(u_B)'
-  rebasing 9:b7ec9e61ccbf tip "c_XYZ"
+  rebasing 9:b7ec9e61ccbf "c_XYZ" (tip)
   $ hg glog
   @  10:cadaa9246c55 (draft): c_XYZ
   |
@@ -222,7 +222,7 @@
   q: quit the prompt
   enter the index of the revision you want to select: q
   abort: user quit
-  [250]
+  [255]
 
   $ hg evolve --config ui.interactive=True << EOF
   > 1
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-evolve.t
--- a/tests/test-evolve.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-evolve.t	Fri Oct 25 16:35:18 2024 +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 
 
@@ -470,23 +470,6 @@
 
 (/ninja)
 
-command-templates.oneline-summary is respected when evolving orphan
-
-  $ hg evolve -n --config 'command-templates.oneline-summary = custom {rev} {desc}'
-  move:custom 8 dansk 2!
-  atop:custom 10 dansk!
-  hg rebase -r bdb9adf2959a -d 74d61108f94b
-  skipping 3db99d6b500c, consider including orphan ancestors
-
-command-templates.oneline-summary is respected when evolving/updating working copy
-
-  $ hg co -q 7
-  working directory parent is obsolete! (acecd63a9288)
-  $ hg evolve --no-all --config 'command-templates.oneline-summary = custom {rev} {desc}'
-  update:custom 10 dansk!
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 74d61108f94b
-
   $ hg evolve --all --traceback
   move:[8] dansk 2!
   atop:[10] dansk!
@@ -655,7 +638,7 @@
   merging 1
   warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
-  [240]
+  [1]
   $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n'
   7:a5bfd90a2f29 
   $ echo 3 > 1
@@ -1181,11 +1164,11 @@
   $ hg next
   hg: unknown command 'next'
   (use 'hg help' for a list of commands)
-  [10]
+  [255]
   $ hg fold
   hg: unknown command 'fold'
   (use 'hg help' for a list of commands)
-  [10]
+  [255]
 Enabling commands selectively, only fold enabled, next is still unknown
   $ cat >> $HGRCPATH <<EOF
   > [experimental]
@@ -1198,7 +1181,7 @@
   $ hg next
   hg: unknown command 'next'
   (use 'hg help' for a list of commands)
-  [10]
+  [255]
 
 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled
 
@@ -1271,7 +1254,7 @@
   $ hg uncommit --all
   abort: cannot uncommit changeset, as that will orphan 4 descendants
   (see 'hg help evolution.instability')
-  [10]
+  [255]
   $ hg up cc75952078c6
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg uncommit --all
@@ -1328,11 +1311,11 @@
   $ hg prune '4086309bffa5 + 57c9733eb876'
   abort: cannot prune changeset, as that will orphan 1 descendants
   (see 'hg help evolution.instability')
-  [10]
+  [255]
   $ hg prune 'a38ac764661b::bc61f0de3ab8'
   abort: cannot prune changeset, as that will orphan 1 descendants
   (see 'hg help evolution.instability')
-  [10]
+  [255]
   $ hg prune '4086309bffa5::'
   3 changesets pruned
   $ glog -r "5478ae0ce2d9::"
@@ -1423,7 +1406,7 @@
   warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ glog -r "desc('add unstableifparentisfolded')::" --hidden
   @  33:bdb2d79645eb@default(draft) will be evolved safely
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-exchange-obsmarkers-case-A3.t
--- a/tests/test-exchange-obsmarkers-case-A3.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-exchange-obsmarkers-case-A3.t	Fri Oct 25 16:35:18 2024 +0400
@@ -229,9 +229,9 @@
   $ hg push -R main -r 'desc(A1)' pushdest
   pushing to pushdest
   searching for changes
-  abort: push creates new remote head e5ea8f9c7314
+  abort: push creates new remote head e5ea8f9c7314!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
   $ cd ..
 
 test obsmarkers exchange.
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-extension-isolation.t
--- a/tests/test-extension-isolation.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-extension-isolation.t	Fri Oct 25 16:35:18 2024 +0400
@@ -42,12 +42,12 @@
   warning: --repository ignored
   abort: no such help topic: evolve
   (try 'hg help --keyword evolve')
-  [10]
+  [255]
   $ hg -R repo-no-ext help -e topic
   warning: --repository ignored
   abort: no such help topic: topic
   (try 'hg help --keyword topic')
-  [10]
+  [255]
 
 start hgweb dir for all repo
 
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-fixup.t
--- a/tests/test-fixup.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-fixup.t	Fri Oct 25 16:35:18 2024 +0400
@@ -175,7 +175,7 @@
   warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg diff
   diff --git a/foo b/foo
@@ -208,7 +208,7 @@
   warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg abort
   fixup aborted
@@ -221,7 +221,7 @@
   warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg status --verbose
   M foo
@@ -282,7 +282,7 @@
   warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
   $ echo 'bonjour fixed' > foo
   $ hg resolve --mark foo
   (no more unresolved files)
@@ -360,25 +360,25 @@
 
   $ hg fixup --continue
   abort: no interrupted fixup to continue
-  [20]
+  [255]
 
   $ hg fixup --abort
   abort: no interrupted fixup to abort
-  [20]
+  [255]
 
 testing error cases
 
   $ hg fixup tip --abort
   abort: cannot specify a revision with --abort
-  [10]
+  [255]
 
   $ hg fixup -r tip --continue
   abort: cannot specify a revision with --continue
-  [10]
+  [255]
 
   $ hg fixup
   abort: please specify a revision to fixup
-  [10]
+  [255]
 
   $ hg fixup tip
   nothing changed
@@ -401,11 +401,11 @@
       --abort    abort an interrupted fixup
   
   (use 'hg fixup -h' to show more help)
-  [10]
+  [255]
 
   $ hg fixup :10 -r 5
   abort: please specify just one revision
-  [10]
+  [255]
 
   $ cd ..
 
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-fold.t
--- a/tests/test-fold.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-fold.t	Fri Oct 25 16:35:18 2024 +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
 
@@ -144,7 +144,7 @@
 (test inherited from test-evolve.t)
 
   $ hg fold --from 6 # want to run hg fold 6
-  abort: hidden revision '6' was rewritten as: 198b5c405d01
+  abort: hidden revision '6' was rewritten as: 198b5c405d01!
   (use --hidden to access hidden revisions)
   [255]
 
@@ -224,11 +224,11 @@
   $ hg fold --from 'desc("r4")'
   abort: cannot fold changeset, as that 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
   (see 'hg help evolution.instability')
-  [10]
+  [255]
 
 test --user variant
 
@@ -432,7 +432,7 @@
   >         --config experimental.evolution.allowdivergence=no
   abort: cannot fold 4b34ecfb0d56, as that 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 3c5966b42c21 -r 8da51e02b5d3 tests/test-issue-5720.t
--- a/tests/test-issue-5720.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-issue-5720.t	Fri Oct 25 16:35:18 2024 +0400
@@ -63,7 +63,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
 Fix the conflict
   $ echo c2 > a
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-metaedit.t
--- a/tests/test-metaedit.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-metaedit.t	Fri Oct 25 16:35:18 2024 +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]
@@ -89,7 +89,7 @@
   $ hg metaedit 'desc(A)::desc(B)' --fold --config 'experimental.evolution=createmarkers, allnewcommands'
   abort: cannot fold changeset, as that 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 3c5966b42c21 -r 8da51e02b5d3 tests/test-namespaces-precheck.t
--- a/tests/test-namespaces-precheck.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-namespaces-precheck.t	Fri Oct 25 16:35:18 2024 +0400
@@ -23,7 +23,7 @@
   $ hg prune null
   abort: cannot prune null changeset
   (no changeset checked out)
-  [10]
+  [255]
 
   $ echo apple > a
   $ hg ci -qAm apple
@@ -41,7 +41,7 @@
   $ hg amend -m 'broccoli'
   abort: refusing to amend changesets with these topic namespaces: foo
   (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces)
-  [10]
+  [255]
   $ hg amend -m 'broccoli' --config experimental.tns-allow-rewrite=foo,something-unrelated
 
   $ echo coconut > b
@@ -52,45 +52,45 @@
   $ hg amend -m 'coconut'
   abort: refusing to amend changesets with these topic namespaces: foo
   (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces)
-  [10]
+  [255]
   $ hg amend --patch -m 'coconut'
   abort: refusing to amend changesets with these topic namespaces: foo
   (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces)
-  [10]
+  [255]
   $ hg uncommit
   abort: refusing to uncommit changesets with these topic namespaces: foo
   (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces)
-  [10]
+  [255]
   $ hg prune -r .
   abort: refusing to prune changesets with these topic namespaces: foo
   (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces)
-  [10]
+  [255]
   $ hg split -r .
   abort: refusing to split changesets with these topic namespaces: foo
   (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces)
-  [10]
+  [255]
   $ hg touch -r .
   abort: refusing to touch changesets with these topic namespaces: foo
   (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces)
-  [10]
+  [255]
 
 Testing core history-rewriting commands
 
   $ hg ci --amend
   abort: refusing to amend changesets with these topic namespaces: foo
   (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces)
-  [10]
+  [255]
   $ hg branch different-branch --rev .
   abort: refusing to change branch of changesets with these topic namespaces: foo
   (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces)
-  [10]
+  [255]
   $ hg rebase -r . -d null
   abort: refusing to rebase changesets with these topic namespaces: foo
   (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces)
-  [10]
+  [255]
   $ hg histedit
   abort: refusing to edit changesets with these topic namespaces: foo
   (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces)
-  [10]
+  [255]
 
   $ cd ..
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-namespaces.t
--- a/tests/test-namespaces.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-namespaces.t	Fri Oct 25 16:35:18 2024 +0400
@@ -52,12 +52,12 @@
   $ hg --encoding utf-8 debug-topic-namespace ©
   abort: invalid topic namespace name: '\xc2\xa9' (esc)
   (topic namespace names can only consist of alphanumeric, '-', '_' and '.' characters)
-  [10]
+  [255]
 
   $ hg --encoding latin1 debug-topic-namespace æ
   abort: invalid topic namespace name: '\xc3\xa6' (esc)
   (topic namespace names can only consist of alphanumeric, '-', '_' and '.' characters)
-  [10]
+  [255]
 
   $ hg branches
 
@@ -68,7 +68,7 @@
   clearing empty topic "feature"
   $ hg topics
 
-  $ hg debugtopicnamespace --clear nonsense
+  $ hg debug-topic-namespace --clear nonsense
   abort: cannot use --clear when setting a topic namespace
   [255]
 
@@ -139,7 +139,7 @@
 Updating to a topic namespace is not supported
 
   $ hg up alice
-  abort: unknown revision 'alice'
+  abort: unknown revision 'alice'!
   [255]
 
 Export/import of topic namespaces
@@ -278,12 +278,12 @@
   $ nslog 'topicnamespace("re:ice$")'
   0: alice
   $ nslog 'topicnamespace(nonsense)'
-  abort: unknown revision 'nonsense'
+  abort: unknown revision 'nonsense'!
   [255]
 
   $ nslog 'topicnamespace("re:nonsense")'
   $ nslog 'topicnamespace("literal:nonsense")'
-  abort: topic namespace 'nonsense' does not exist
+  abort: topic namespace 'nonsense' does not exist!
   [255]
 
 Debug command related to the default/empty topic namespace
@@ -340,7 +340,7 @@
 
 Parsing
 
-  $ hg debugparsefqbn foo/bar//user26/feature -T '[{branch}] <{topic_namespace}> ({topic})\n'
+  $ hg debug-parse-fqbn foo/bar//user26/feature -T '[{branch}] <{topic_namespace}> ({topic})\n'
   [foo/bar] <user26> (feature)
 
 no double slashes means it's a named branch
@@ -351,7 +351,7 @@
 
 Formatting
 
-  $ hg debugformatfqbn -b branch -n namespace -t topic
+  $ hg debug-format-fqbn -b branch -n namespace -t topic
   branch//namespace/topic
 
   $ hg debug-format-fqbn -n namespace
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-next-abort.t
--- a/tests/test-next-abort.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-next-abort.t	Fri Oct 25 16:35:18 2024 +0400
@@ -27,7 +27,7 @@
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
 #testcases abortcommand abortflag
 #if abortflag
@@ -36,17 +36,17 @@
   working directory is now at 1c7f51cf0ef0
   $ hg next --abort
   abort: no interrupted next to abort
-  [20]
+  [255]
   $ hg evolve --abort
   abort: no interrupted evolve to abort
-  [20]
+  [255]
 
   $ hg next --abort --move-bookmark
   abort: cannot specify both --abort and --move-bookmark
-  [10]
+  [255]
   $ hg next --abort --merge
   abort: cannot specify both --abort and --merge
-  [10]
+  [255]
 #else
   $ hg abort --dry-run
   evolve in progress, will be aborted
@@ -55,7 +55,7 @@
   working directory is now at 1c7f51cf0ef0
   $ hg abort
   abort: no operation in progress
-  [20]
+  [255]
 #endif
 
   $ cd ..
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-obsolete.t
--- a/tests/test-obsolete.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-obsolete.t	Fri Oct 25 16:35:18 2024 +0400
@@ -170,7 +170,7 @@
   $ hg init ../other-new
   $ hg phase --draft 'secret() - extinct()' # until we fix exclusion
   abort: empty revision set
-  [10]
+  [255]
   $ hg push ../other-new
   pushing to ../other-new
   searching for changes
@@ -310,7 +310,7 @@
 ..  $ hg push ../other-old
 ..  pushing to ../other-old
 ..  searching for changes
-..  abort: push includes an unstable changeset: 909a0fb57e5d
+..  abort: push includes an unstable changeset: 909a0fb57e5d!
 ..  (use 'hg evolve' to get a stable history or --force to ignore warnings)
 ..  [255]
 ..  $ hg push -f ../other-old
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-options.t
--- a/tests/test-options.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-options.t	Fri Oct 25 16:35:18 2024 +0400
@@ -27,4 +27,4 @@
   $ hg prune
   hg: unknown command 'prune'
   (use 'hg help' for a list of commands)
-  [10]
+  [255]
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-pick.t
--- a/tests/test-pick.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-pick.t	Fri Oct 25 16:35:18 2024 +0400
@@ -84,22 +84,22 @@
 
   $ hg pick --continue
   abort: no interrupted pick state exists
-  [20]
+  [255]
 #if abortcontinuecommand
   $ hg continue
   abort: no operation in progress
-  [20]
+  [255]
 #endif
 
 Aborting without interrupted pick
 
   $ hg pick --abort
   abort: no interrupted pick state exists
-  [20]
+  [255]
 #if abortcontinuecommand
   $ hg abort
   abort: no operation in progress
-  [20]
+  [255]
 #endif
 
 Specifying both continue and revs
@@ -206,7 +206,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
-  [240]
+  [1]
 
   $ echo foobar > c
   $ hg resolve --all --mark
@@ -248,7 +248,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
-  [240]
+  [1]
   $ echo foobar > c
   $ hg resolve -m
   (no more unresolved files)
@@ -273,7 +273,7 @@
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
-  [240]
+  [1]
 
 #if abortcontinuecommand
   $ hg abort --dry-run
@@ -306,7 +306,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
@@ -334,7 +334,7 @@
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
-  [240]
+  [1]
 
   $ echo bar > b
   $ hg resolve -m
@@ -508,7 +508,7 @@
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
-  [240]
+  [1]
   $ hg resolve -t :other a
   (no more unresolved files)
   continue: hg pick --continue
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-prev-next.t
--- a/tests/test-prev-next.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-prev-next.t	Fri Oct 25 16:35:18 2024 +0400
@@ -125,14 +125,14 @@
   $ hg prev
   abort: uncommitted changes
   (do you want --merge?)
-  [20]
+  [255]
   $ hg prev --merge
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   [0] added a
   $ hg next
   abort: uncommitted changes
   (do you want --merge?)
-  [20]
+  [255]
   $ hg next --merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   [1] added b
@@ -390,7 +390,7 @@
   $ hg next --evolve
   abort: uncommitted changes
   (use `hg amend`, `hg revert` or `hg shelve`)
-  [20]
+  [255]
 
   $ cd ..
 
@@ -481,7 +481,7 @@
   $ hg prev --config commands.update.check=abort
   abort: uncommitted changes
   (do you want --merge?)
-  [20]
+  [255]
   $ hg prev --merge --config commands.update.check=abort
   file 'bar' was deleted in other [destination] but was modified in local [working copy].
   You can use (c)hanged version, (d)elete, or leave (u)nresolved.
@@ -502,7 +502,7 @@
   $ hg next --config commands.update.check=abort
   abort: uncommitted changes
   (do you want --merge?)
-  [20]
+  [255]
   $ hg next --merge --config commands.update.check=abort
   merging bar
   warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
@@ -621,6 +621,49 @@
 
   $ cd ..
 
+hg next --abort
+
+  $ hg init next-abort
+  $ cd next-abort
+
+  $ echo apple > a
+  $ hg ci -qAm apple
+  $ echo banana > b
+  $ hg ci -qAm banana
+  $ hg up 0
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ echo blueberry > b
+  $ hg ci -qAm 'apple and blueberry' --amend
+  1 new orphan changesets
+
+  $ hg next
+  move:[1] banana
+  atop:[2] apple and blueberry
+  merging b
+  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
+  unresolved merge conflicts
+  (see 'hg help evolve.interrupted')
+  [1]
+
+  $ hg next --abort
+  next aborted
+  working directory is now at 1c7f51cf0ef0
+  $ hg next --abort
+  abort: no interrupted next to abort
+  [255]
+  $ hg evolve --abort
+  abort: no interrupted evolve to abort
+  [255]
+
+  $ hg next --abort --move-bookmark
+  abort: cannot specify both --abort and --move-bookmark
+  [255]
+  $ hg next --abort --merge
+  abort: cannot specify both --abort and --merge
+  [255]
+
+  $ cd ..
+
 Testing --merge and --evolve flags: 1 child, 1 aspchild, dirty working copy
 
   $ hg init next-dirty-evolve
@@ -661,15 +704,15 @@
   $ hg next --no-merge --evolve --dry-run
   abort: uncommitted changes
   (use `hg amend`, `hg revert` or `hg shelve`)
-  [20]
+  [255]
   $ hg next --no-merge --no-evolve --dry-run
   abort: uncommitted changes
   (do you want --merge?)
-  [20]
+  [255]
   $ hg next --merge --no-evolve --dry-run
   hg update db0dc1f00682;
   [4] durian
   $ hg next --merge --evolve --dry-run
   abort: uncommitted changes
   (use `hg amend`, `hg revert` or `hg shelve`)
-  [20]
+  [255]
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-prune.t
--- a/tests/test-prune.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-prune.t	Fri Oct 25 16:35:18 2024 +0400
@@ -37,19 +37,19 @@
 
   $ hg prune --fold --pair
   abort: cannot specify both --pair and --fold
-  [10]
+  [255]
   $ hg prune --fold --biject
   abort: cannot specify both --biject and --fold
-  [10]
+  [255]
   $ hg prune --split --fold
   abort: cannot specify both --fold and --split
-  [10]
+  [255]
   $ hg prune --split --fold --pair
   abort: cannot specify both --pair and --fold
-  [10]
+  [255]
   $ hg prune --split --fold --biject
   abort: cannot specify both --fold and --split
-  [10]
+  [255]
 
 Check simple case
 ----------------------------
@@ -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'}
@@ -172,7 +172,7 @@
 
   $ hg prune 'desc("add dd")' -s 'desc("add nD")' -s 'desc("add nC")'
   abort: please add --split if you want to do a split
-  [10]
+  [255]
   $ hg prune 'desc("add dd")' -s 'desc("add nD")' -s 'desc("add nC")' --split
   1 changesets pruned
   $ hg debugobsolete
@@ -203,7 +203,7 @@
   $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nD")' -s 'desc("add nC")'
   abort: cannot use multiple successors for multiple precursors
   (use --pair to mark a series as a replacement for another)
-  [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'}
@@ -216,7 +216,7 @@
 
   $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nB")'
   abort: please add --fold if you want to do a fold
-  [10]
+  [255]
   $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nB")' --fold
   2 changesets pruned
   $ hg debugobsolete
@@ -295,7 +295,7 @@
   $ hg prune -B nostrip
   bookmark 'nostrip' deleted
   abort: no revisions specified to prune
-  [10]
+  [255]
   $ hg tag --remove --local a
   $ hg prune -B todelete
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -304,7 +304,7 @@
   bookmark 'todelete' deleted
   1 changesets pruned
   $ hg id -ir dcbb326fdec2
-  abort: hidden revision 'dcbb326fdec2' is pruned
+  abort: hidden revision 'dcbb326fdec2' is pruned!
   (use --hidden to access hidden revisions)
   [255]
   $ hg id -ir d62d843c9a01
@@ -338,7 +338,7 @@
   3 changesets pruned
   $ hg tag --remove --local c
   $ hg id -ir 6:2702dd0c91e7
-  abort: hidden revision '6' is pruned
+  abort: hidden revision '6' is pruned!
   (use --hidden to access hidden revisions)
   [255]
 
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-push-checkheads-mixed-branch-topic-G3.t
--- a/tests/test-push-checkheads-mixed-branch-topic-G3.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-push-checkheads-mixed-branch-topic-G3.t	Fri Oct 25 16:35:18 2024 +0400
@@ -90,8 +90,8 @@
   $ hg push -r 'desc("C1")'
   pushing to $TESTTMP/E1/server
   searching for changes
-  abort: push creates new remote head dc44c53142f0
+  abort: push creates new remote head dc44c53142f0!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
 
   $ cd ../..
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-push-checkheads-multi-topics-F3.t
--- a/tests/test-push-checkheads-multi-topics-F3.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-push-checkheads-multi-topics-F3.t	Fri Oct 25 16:35:18 2024 +0400
@@ -94,8 +94,8 @@
   $ hg push -r 'desc("C1")'
   pushing to $TESTTMP/E1/server
   searching for changes
-  abort: push creates new remote head 57530ca5eb24 on branch 'default//Y'
+  abort: push creates new remote head 57530ca5eb24 on branch 'default//Y'!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
 
   $ cd ../..
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-push-checkheads-multibranches-E3.t
--- a/tests/test-push-checkheads-multibranches-E3.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-push-checkheads-multibranches-E3.t	Fri Oct 25 16:35:18 2024 +0400
@@ -90,8 +90,8 @@
   $ hg push -r 'desc("C1")'
   pushing to $TESTTMP/E1/server
   searching for changes
-  abort: push creates new remote head dc44c53142f0
+  abort: push creates new remote head dc44c53142f0!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
 
   $ cd ../..
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-push-checkheads-partial-C1.t
--- a/tests/test-push-checkheads-partial-C1.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-push-checkheads-partial-C1.t	Fri Oct 25 16:35:18 2024 +0400
@@ -77,6 +77,6 @@
   $ hg push
   pushing to $TESTTMP/server
   searching for changes
-  abort: push creates new remote head 25c56d33e4c4
+  abort: push creates new remote head 25c56d33e4c4!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-push-checkheads-partial-C2.t
--- a/tests/test-push-checkheads-partial-C2.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-push-checkheads-partial-C2.t	Fri Oct 25 16:35:18 2024 +0400
@@ -79,8 +79,8 @@
   $ hg push --rev 'desc(A1)'
   pushing to $TESTTMP/C2/server (glob)
   searching for changes
-  abort: push creates new remote head f6082bc4ffef
+  abort: push creates new remote head f6082bc4ffef!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
 
   $ cd ../..
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-push-checkheads-partial-C3.t
--- a/tests/test-push-checkheads-partial-C3.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-push-checkheads-partial-C3.t	Fri Oct 25 16:35:18 2024 +0400
@@ -78,8 +78,8 @@
   $ hg push
   pushing to $TESTTMP/C3/server (glob)
   searching for changes
-  abort: push creates new remote head 0f88766e02d6
+  abort: push creates new remote head 0f88766e02d6!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
 
   $ cd ../..
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-push-checkheads-partial-C4.t
--- a/tests/test-push-checkheads-partial-C4.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-push-checkheads-partial-C4.t	Fri Oct 25 16:35:18 2024 +0400
@@ -79,8 +79,8 @@
   $ hg push --rev 'desc(C0)'
   pushing to $TESTTMP/C4/server (glob)
   searching for changes
-  abort: push creates new remote head 0f88766e02d6
+  abort: push creates new remote head 0f88766e02d6!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
 
   $ cd ../..
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-push-checkheads-unpushed-D1.t
--- a/tests/test-push-checkheads-unpushed-D1.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-push-checkheads-unpushed-D1.t	Fri Oct 25 16:35:18 2024 +0400
@@ -71,9 +71,9 @@
   $ hg push -r 'desc(B0)'
   pushing to $TESTTMP/D1/server (glob)
   searching for changes
-  abort: push creates new remote head 74ff5441d343
+  abort: push creates new remote head 74ff5441d343!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
 
   $ cd ../..
 
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-push-checkheads-unpushed-D2.t
--- a/tests/test-push-checkheads-unpushed-D2.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-push-checkheads-unpushed-D2.t	Fri Oct 25 16:35:18 2024 +0400
@@ -92,8 +92,8 @@
   $ hg push --rev 'desc(C0)'
   pushing to $TESTTMP/D2/server (glob)
   searching for changes
-  abort: push creates new remote head 0f88766e02d6
+  abort: push creates new remote head 0f88766e02d6!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
 
   $ cd ../..
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-push-checkheads-unpushed-D3.t
--- a/tests/test-push-checkheads-unpushed-D3.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-push-checkheads-unpushed-D3.t	Fri Oct 25 16:35:18 2024 +0400
@@ -91,15 +91,15 @@
   $ hg push --rev 'desc(A1)'
   pushing to $TESTTMP/D3/server (glob)
   searching for changes
-  abort: push creates new remote head f6082bc4ffef
+  abort: push creates new remote head f6082bc4ffef!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
   $ hg push --rev 'desc(B1)'
   pushing to $TESTTMP/D3/server (glob)
   searching for changes
-  abort: push creates new remote head 25c56d33e4c4
+  abort: push creates new remote head 25c56d33e4c4!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
 
 Extra testing
 -------------
@@ -109,8 +109,8 @@
   $ hg push
   pushing to $TESTTMP/D3/server (glob)
   searching for changes
-  abort: push creates new remote head 25c56d33e4c4
+  abort: push creates new remote head 25c56d33e4c4!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
 
   $ cd ../..
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-push-checkheads-unpushed-D4.t
--- a/tests/test-push-checkheads-unpushed-D4.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-push-checkheads-unpushed-D4.t	Fri Oct 25 16:35:18 2024 +0400
@@ -109,9 +109,9 @@
   $ hg push --rev 'desc(A1)'
   pushing to $TESTTMP/D4/server (glob)
   searching for changes
-  abort: push creates new remote head f6082bc4ffef
+  abort: push creates new remote head f6082bc4ffef!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
 
 Actual testing (existing branch only)
 ------------------------------------
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-push-checkheads-unpushed-D5.t
--- a/tests/test-push-checkheads-unpushed-D5.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-push-checkheads-unpushed-D5.t	Fri Oct 25 16:35:18 2024 +0400
@@ -98,9 +98,9 @@
   $ hg push --rev 'desc(B1)'
   pushing to $TESTTMP/D5/server (glob)
   searching for changes
-  abort: push creates new remote head 25c56d33e4c4
+  abort: push creates new remote head 25c56d33e4c4!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
   $ hg push --rev 'desc(A1)'
   pushing to $TESTTMP/D5/server (glob)
   searching for changes
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-push-checkheads-unpushed-D6.t
--- a/tests/test-push-checkheads-unpushed-D6.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-push-checkheads-unpushed-D6.t	Fri Oct 25 16:35:18 2024 +0400
@@ -79,8 +79,8 @@
   $ hg push --rev 'desc(C0)'
   pushing to $TESTTMP/D6/server (glob)
   searching for changes
-  abort: push creates new remote head 0f88766e02d6
+  abort: push creates new remote head 0f88766e02d6!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
 
   $ cd ../..
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-rewind.t
--- a/tests/test-rewind.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-rewind.t	Fri Oct 25 16:35:18 2024 +0400
@@ -1202,13 +1202,13 @@
 
   $ hg rewind --to 'desc("amended")' --hidden
   abort: uncommitted changes
-  [20]
+  [255]
 
 XXX: Unfortunately, even with --keep it's not allowed
 
   $ hg rewind --keep --to 'desc("amended")' --hidden
   abort: uncommitted changes
-  [20]
+  [255]
 
   $ cd ..
 
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-sharing.t
--- a/tests/test-sharing.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-sharing.t	Fri Oct 25 16:35:18 2024 +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
@@ -345,9 +345,9 @@
   pushing to ../public
   searching for changes
   remote has heads on branch 'default' that are not known locally: 9d21d673314a
-  abort: push creates new remote head 3363442626b3 with bookmark 'bug15'
+  abort: push creates new remote head 3363442626b3 with bookmark 'bug15'!
   (pull and merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
   $ hg pull ../public
   pulling from ../public
   searching for changes
@@ -379,7 +379,7 @@
 Alice rebases her draft changeset on top of Bob's public changeset and
 publishes the result.
   $ hg rebase -d 4
-  rebasing 3:3363442626b3 bug15 "fix bug 15 (v2)"
+  rebasing 3:3363442626b3 "fix bug 15 (v2)" (bug15)
   $ hg push ../public
   pushing to ../public
   searching for changes
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-split.t
--- a/tests/test-split.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-split.t	Fri Oct 25 16:35:18 2024 +0400
@@ -127,7 +127,7 @@
   $ echo "_cd" > _c
   $ hg split
   abort: uncommitted changes
-  [20]
+  [255]
   $ hg up "desc(_c)" -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
@@ -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
@@ -353,7 +353,7 @@
   $ hg split -r "desc(split3)"
   abort: cannot split changeset, as that will orphan 4 descendants
   (see 'hg help evolution.instability')
-  [10]
+  [255]
 
 Changing evolution level to createmarkers
   $ echo "[experimental]" >> $HGRCPATH
@@ -371,7 +371,7 @@
   (enter ? for help) [Ynesfdaq?] q
   
   abort: user quit
-  [250]
+  [255]
 
 Running split with tip revision, specified as unnamed argument
   $ hg split --rev . << EOF
@@ -385,7 +385,7 @@
   (enter ? for help) [Ynesfdaq?] q
   
   abort: user quit
-  [250]
+  [255]
 
 Running split with both unnamed and named revision arguments shows an error msg
   $ hg split  --rev . --rev .^ << EOF
@@ -653,7 +653,7 @@
   (enter ? for help) [Ynesfdaq?] q
   
   abort: user quit
-  [250]
+  [255]
 
   $ hg branch
   another-branch
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-stabilize-conflict.t	Fri Oct 25 16:35:18 2024 +0400
@@ -133,7 +133,7 @@
   warning: conflicts while merging babar! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
   $ hg resolve -l
   U babar
   $ hg log -G
@@ -231,7 +231,7 @@
   merging babar failed!
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
   $ hg resolve -l
   U babar
   $ hg log -G
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-topic-change.t
--- a/tests/test-topic-change.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-topic-change.t	Fri Oct 25 16:35:18 2024 +0400
@@ -180,13 +180,13 @@
      Added a  ()
   
   $ hg rebase -s 11 -d 22
-  rebasing 11:1315a3808ed0 foo "Added d"
+  rebasing 11:1315a3808ed0 "Added d" (foo)
   switching to topic foo
-  rebasing 16:edc4a6b9ea60 bar "Added e"
+  rebasing 16:edc4a6b9ea60 "Added e" (bar)
   switching to topic bar
-  rebasing 17:82e0b14f4d9e bar "Added f"
-  rebasing 18:e7b418d79a05 bar "Added g"
-  rebasing 20:c2d6b7df5dcf foobar "Added h"
+  rebasing 17:82e0b14f4d9e "Added f" (bar)
+  rebasing 18:e7b418d79a05 "Added g" (bar)
+  rebasing 20:c2d6b7df5dcf "Added h" (foobar)
   switching to topic foobar
 
   $ hg glog
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-topic-dest.t
--- a/tests/test-topic-dest.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-topic-dest.t	Fri Oct 25 16:35:18 2024 +0400
@@ -113,7 +113,7 @@
   switching to topic elephant
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg rebase
-  rebasing 4:cb7ae72f4a80 elephant "babar"
+  rebasing 4:cb7ae72f4a80 "babar" (elephant)
   switching to topic elephant
   $ hg log -G
   @  7 (elephant) babar
@@ -134,7 +134,7 @@
   switching to topic monkey
   1 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ hg rebase
-  rebasing 5:d832ddc604ec monkey "zephir"
+  rebasing 5:d832ddc604ec "zephir" (monkey)
   switching to topic monkey
   $ hg log -G
   @  8 (monkey) zephir
@@ -177,7 +177,7 @@
   o  0 () c_alpha
   
   $ hg rebase
-  rebasing 9:d79a104e2902 tip monkey "Huc"
+  rebasing 9:d79a104e2902 "Huc" (tip monkey)
   $ hg log -G
   @  10 (monkey) Huc
   |
@@ -229,7 +229,7 @@
   switching to topic elephant
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg rebase -d 'desc(c_zeta)' # make sure tip is elsewhere
-  rebasing 7:8d0b77140b05 elephant "babar"
+  rebasing 7:8d0b77140b05 "babar" (elephant)
   switching to topic elephant
   $ hg up monkey
   switching to topic monkey
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-topic-flow-publish-flag.t
--- a/tests/test-topic-flow-publish-flag.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-topic-flow-publish-flag.t	Fri Oct 25 16:35:18 2024 +0400
@@ -399,9 +399,9 @@
   $ hg push -r 'desc("c_dN0")' --publish
   pushing to $TESTTMP/bare-branch-server
   searching for changes
-  abort: push creates new remote head 4dcd0be9db96
+  abort: push creates new remote head 4dcd0be9db96!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
   $ hg tgl 'all()'
   @  14:4dcd0be9db96 c_dN0 draft default topic_B
   |
@@ -439,6 +439,7 @@
 
   $ cd $TESTTMP/bare-client/.hg/cache/
   $ grep double branch2* | sort
+  branch2-base:* o double//slash (glob)
   branch2-immutable:* o double//slash (glob)
 
   $ cd $TESTTMP/bare-branch-server/.hg/cache/
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-topic-push.t
--- a/tests/test-topic-push.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-topic-push.t	Fri Oct 25 16:35:18 2024 +0400
@@ -81,9 +81,9 @@
   $ hg push
   pushing to $TESTTMP/main
   searching for changes
-  abort: push creates new remote head 9fe81b7f425d
+  abort: push creates new remote head 9fe81b7f425d!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
   $ hg outgoing -r 'desc(CB)' -G
   comparing with $TESTTMP/main
   searching for changes
@@ -111,9 +111,9 @@
   $ hg push
   pushing to $TESTTMP/main
   searching for changes
-  abort: push creates new remote branches: double//slash//
+  abort: push creates new remote branches: double//slash//!
   (use 'hg push --new-branch' to create new remote branches)
-  [20]
+  [255]
   $ hg push --new-branch
   pushing to $TESTTMP/main
   searching for changes
@@ -210,10 +210,10 @@
   
 
   $ hg outgoing draft --topic nonexistent
-  abort: topic 'nonexistent' does not exist
+  abort: topic 'nonexistent' does not exist!
   [255]
   $ hg push draft --topic nonexistent
-  abort: topic 'nonexistent' does not exist
+  abort: topic 'nonexistent' does not exist!
   [255]
 
   $ hg up babar
@@ -254,9 +254,9 @@
   $ hg push
   pushing to $TESTTMP/main
   searching for changes
-  abort: push creates new remote head 67f579af159d
+  abort: push creates new remote head 67f579af159d!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
   $ hg log -G
   @  4 default babar draft CD
   |
@@ -300,9 +300,9 @@
   $ hg push ssh://user@dummy/draft
   pushing to ssh://user@dummy/draft
   searching for changes
-  abort: push creates new remote head 84eaf32db6c3
+  abort: push creates new remote head 84eaf32db6c3!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
   $ hg log -G
   @  5 default celeste draft CE
   |
@@ -342,9 +342,9 @@
   $ hg push ssh://user@dummy/main
   pushing to ssh://user@dummy/main
   searching for changes
-  abort: push creates new remote head 67f579af159d
+  abort: push creates new remote head 67f579af159d!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
   $ hg log -G
   @  5 default celeste draft CE
   |
@@ -384,9 +384,9 @@
   $ hg push draft
   pushing to $TESTTMP/draft
   searching for changes
-  abort: push creates new remote head f0bc62a661be on branch 'default//babar'
+  abort: push creates new remote head f0bc62a661be on branch 'default//babar'!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
 
 Multiple heads on a branch merged into a topic branch
 -----------------------------------------------------
@@ -428,9 +428,9 @@
   $ hg push draft -r .
   pushing to $TESTTMP/draft
   searching for changes
-  abort: push creates new remote head 4937c4cad39e
+  abort: push creates new remote head 4937c4cad39e!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
 
 Reject when pushing to publishing
 
@@ -509,4 +509,4 @@
   searching for changes
   no changes found
   abort: push creates new heads on branch 'default': bbd9d6199b88
-  [20]
+  [255]
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-topic-rebase.t
--- a/tests/test-topic-rebase.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-topic-rebase.t	Fri Oct 25 16:35:18 2024 +0400
@@ -59,7 +59,7 @@
   switching to topic myfeature
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg rebase
-  rebasing 1:39e7a938055e myfeature "add feature1"
+  rebasing 1:39e7a938055e "add feature1" (myfeature)
   switching to topic myfeature
   $ hg stack
   ### topic: myfeature
@@ -110,12 +110,12 @@
   switching to topic myotherfeature
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg rebase
-  rebasing 5:81f854012ec5 myotherfeature "myotherfeature1"
+  rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature)
   merging file
   warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
   switching to topic myotherfeature
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
-  [240]
+  [1]
 
 Resolve the conflict
   $ echo A2 > file
@@ -124,7 +124,7 @@
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase --continue
-  rebasing 5:81f854012ec5 myotherfeature "myotherfeature1"
+  rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature)
 
 Check the the commit has the right topic
 
@@ -162,7 +162,7 @@
   $ echo x > a.txt
   $ hg ci -Aqm x
   $ hg rebase -r . -d 3 --config rebase.experimental.inmemory=1
-  rebasing 8:1323571d782d tip myotherfeature "x"
+  rebasing 8:1323571d782d "x" (tip myotherfeature)
   switching to topic myfeature
   switching to topic myotherfeature
   $ logtopic
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-topic-stack-complex.t
--- a/tests/test-topic-stack-complex.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-topic-stack-complex.t	Fri Oct 25 16:35:18 2024 +0400
@@ -160,7 +160,7 @@
   1 new orphan changesets
   2 new content-divergent changesets
   $ hg rebase -r . -d ec94a1ed1330~1
-  rebasing 9:eb3b16fef8ea tip foo "Added e and f"
+  rebasing 9:eb3b16fef8ea "Added e and f" (tip foo)
   $ hg stack
   ### topic: foo (2 heads)
   ### target: default (branch)
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-topic-stack.t
--- a/tests/test-topic-stack.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-topic-stack.t	Fri Oct 25 16:35:18 2024 +0400
@@ -379,11 +379,11 @@
 
   $ hg log -r 'stack(foo)'
   hg: parse error: stack takes no arguments, it works on current topic
-  [10]
+  [255]
 
   $ hg log -r 'stack(foobar)'
   hg: parse error: stack takes no arguments, it works on current topic
-  [10]
+  [255]
 
 Stack relation:
 
@@ -410,8 +410,8 @@
 Make things linear again
 
   $ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()'
-  rebasing 4:0f9ac936c87d foo "c_e"
-  rebasing 5:6559e6d93aea foo "c_f"
+  rebasing 4:0f9ac936c87d "c_e" (foo)
+  rebasing 5:6559e6d93aea "c_f" (foo)
   $ hg log -G
   o  8 default {foo} draft c_f
   |
@@ -480,8 +480,8 @@
   $ hg commit --amend -m 'c_D' 
   4 new orphan changesets
   $ hg rebase -d . -s 'desc(c_g)'
-  rebasing 9:81264ae8a36a foo "c_g"
-  rebasing 10:fde5f5941642 foo "c_h"
+  rebasing 9:81264ae8a36a "c_g" (foo)
+  rebasing 10:fde5f5941642 "c_h" (foo)
   $ hg log -G
   o  13 default {foo} draft c_h
   |
@@ -546,8 +546,8 @@
   
 Converting into a linear chain
   $ hg rebase -s 'desc("c_e") - obsolete()' -d 'desc("c_h") - obsolete()'
-  rebasing 7:215bc359096a foo "c_e"
-  rebasing 8:ec9267b3f33f foo "c_f"
+  rebasing 7:215bc359096a "c_e" (foo)
+  rebasing 8:ec9267b3f33f "c_f" (foo)
 
   $ hg log -G
   o  15 default {foo} draft c_f
@@ -593,17 +593,17 @@
   o  0 default {} public c_a
   
   $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()'
-  rebasing 15:77082e55de88 foo "c_f"
+  rebasing 15:77082e55de88 "c_f" (foo)
   switching to topic foo
   1 new orphan changesets
   switching to topic foobar
   $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()'
-  rebasing 12:0c3e8aed985d foo "c_g"
+  rebasing 12:0c3e8aed985d "c_g" (foo)
   switching to topic foo
-  rebasing 13:b9e4f3709bc5 foo "c_h"
-  rebasing 16:4bc813530301 foobar "c_e"
+  rebasing 13:b9e4f3709bc5 "c_h" (foo)
+  rebasing 16:4bc813530301 "c_e" (foobar)
   switching to topic foobar
-  rebasing 18:4406ea4be852 tip foo "c_f"
+  rebasing 18:4406ea4be852 "c_f" (tip foo)
   switching to topic foo
   switching to topic foobar
   $ hg up
@@ -907,13 +907,13 @@
 get things linear again
 
   $ hg rebase -r s1 -d default
-  rebasing 16:c9b07601c2f4 tip blue "c_D"
+  rebasing 16:c9b07601c2f4 "c_D" (tip blue)
   switching to topic-namespace my-tns
   switching to topic blue
   $ hg rebase -r s2 -d s1
-  rebasing 13:90c34d9f99aa blue "c_G"
+  rebasing 13:90c34d9f99aa "c_G" (blue)
   $ hg rebase -r s3 -d s2
-  rebasing 8:77174443ad61 blue "c_I"
+  rebasing 8:77174443ad61 "c_I" (blue)
   $ hg stack
   ### topic: blue
   ### target: default (branch)
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-topic-tutorial.t
--- a/tests/test-topic-tutorial.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-topic-tutorial.t	Fri Oct 25 16:35:18 2024 +0400
@@ -488,10 +488,10 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg rebase
-  rebasing 1:9e90e00c084b food "adding condiments"
+  rebasing 1:9e90e00c084b "adding condiments" (food)
   merging shopping
   switching to topic food
-  rebasing 2:a25aaa6b9385 food "adding fruits"
+  rebasing 2:a25aaa6b9385 "adding fruits" (food)
   merging shopping
 
   $ hg log --graph
@@ -1055,12 +1055,12 @@
 #endif
 
   $ hg rebase
-  rebasing 6:6d6f38ff45f0 tools "Adding hammer"
+  rebasing 6:6d6f38ff45f0 "Adding hammer" (tools)
   merging shopping
   switching to topic tools
-  rebasing 7:c1d9846a234f tools "Adding saw"
+  rebasing 7:c1d9846a234f "Adding saw" (tools)
   merging shopping
-  rebasing 8:9ef4e4f40a79 tools "Adding drill"
+  rebasing 8:9ef4e4f40a79 "Adding drill" (tools)
   merging shopping
 
 But what about the other topic? You can use ``hg topics --verbose`` to see
@@ -1077,9 +1077,9 @@
   $ hg push --rev drinks
   pushing to $TESTTMP/server (glob)
   searching for changes
-  abort: push creates new remote head 0b8a99ba9213
+  abort: push creates new remote head 0b8a99ba9213!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
 
 
 Even after a rebase, pushing all active topics at the same time would publish
@@ -1087,19 +1087,19 @@
 multiple *public* heads it would create on that branch:
 
   $ hg rebase -b drinks
-  rebasing 9:213e97c6cd8a drinks "Adding apple juice"
+  rebasing 9:213e97c6cd8a "Adding apple juice" (drinks)
   merging shopping
   switching to topic drinks
-  rebasing 10:0b8a99ba9213 drinks "Adding orange juice"
+  rebasing 10:0b8a99ba9213 "Adding orange juice" (drinks)
   merging shopping
   switching to topic tools
 
   $ hg push
   pushing to $TESTTMP/server (glob)
   searching for changes
-  abort: push creates new remote head 56656c6d1153
+  abort: push creates new remote head 56656c6d1153!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
 
 Publishing only one of them is allowed (as long as it does not create a new
 branch head as we just saw in the previous case):
@@ -1777,9 +1777,9 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg rebase
-  rebasing 19:7537e3a3cbca tools "Adding saw"
+  rebasing 19:7537e3a3cbca "Adding saw" (tools)
   merging shopping
-  rebasing 20:9d65331e0dc1 tools "Adding drill"
+  rebasing 20:9d65331e0dc1 "Adding drill" (tools)
   merging shopping
 
   $ hg stack
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-topic.t
--- a/tests/test-topic.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-topic.t	Fri Oct 25 16:35:18 2024 +0400
@@ -254,44 +254,44 @@
   [1]
   $ hg topics --current somerandomtopic
   abort: cannot use --current when setting a topic
-  [10]
+  [255]
   $ hg topics --current --clear
   abort: cannot use --current and --clear
-  [10]
+  [255]
   $ hg topics --clear somerandomtopic
   abort: cannot use --clear when setting a topic
-  [10]
+  [255]
   $ hg topics --list --clear
   abort: cannot specify both --list and --clear
-  [10]
+  [255]
 
 Trying some invalid topicnames
 
   $ hg topic '.'
   abort: the name '.' is reserved
-  [10]
+  [255]
   $ hg topic null
   abort: the name 'null' is reserved
-  [10]
+  [255]
   $ hg topic tip
   abort: the name 'tip' is reserved
-  [10]
+  [255]
   $ hg topic 12345
   abort: cannot use an integer as a name
-  [10]
+  [255]
   $ hg topic '   '
   abort: topic names cannot consist entirely of whitespace
-  [10]
+  [255]
 
   $ hg topic 'a12#45'
   abort: invalid topic name: 'a12#45'
   (topic names can only consist of alphanumeric, '-', '_' and '.' characters)
-  [10]
+  [255]
 
   $ hg topic 'foo bar'
   abort: invalid topic name: 'foo bar'
   (topic names can only consist of alphanumeric, '-', '_' and '.' characters)
-  [10]
+  [255]
 
 this is trying to list topic names
   $ hg topic ''
@@ -299,7 +299,7 @@
   $ hg topic '*12 B23'
   abort: invalid topic name: '*12 B23'
   (topic names can only consist of alphanumeric, '-', '_' and '.' characters)
-  [10]
+  [255]
 
 Test commit flag and help text
 
@@ -315,7 +315,7 @@
   HG: branch 'default'
   HG: changed alpha
   abort: empty commit message
-  [10]
+  [255]
   $ hg revert alpha
   $ hg topic
    * topicflag (0 changesets)
@@ -336,12 +336,12 @@
   $ hg --encoding utf-8 topic ©
   abort: invalid topic name: '\xc2\xa9' (esc)
   (topic names can only consist of alphanumeric, '-', '_' and '.' characters)
-  [10]
+  [255]
 
   $ hg --encoding latin1 topic æ
   abort: invalid topic name: '\xc3\xa6' (esc)
   (topic names can only consist of alphanumeric, '-', '_' and '.' characters)
-  [10]
+  [255]
 
 Make a topic
 
@@ -670,7 +670,7 @@
    * query (1 changesets)
   $ hg pull ../pinky -r narf
   pulling from ../pinky
-  abort: unknown revision 'narf'
+  abort: unknown revision 'narf'!
   [255]
   $ hg pull ../pinky -r default
   pulling from ../pinky
@@ -844,13 +844,13 @@
   $ tlog 'topic(wdir())'
   9: fran
   $ tlog 'topic(nonsense)'
-  abort: unknown revision 'nonsense'
+  abort: unknown revision 'nonsense'!
   [255]
 
 Pattern matching in topic() revset
   $ tlog 'topic("re:nonsense")'
   $ tlog 'topic("literal:nonsense")'
-  abort: topic 'nonsense' does not exist
+  abort: topic 'nonsense' does not exist!
   [255]
 
 Sanity checks for topicnamespace() revset
@@ -1166,7 +1166,7 @@
 
   $ hg topics --age random
   abort: cannot use --age while setting a topic
-  [10]
+  [255]
   $ cd ..
 
 Test that topics doesn't confuse branchheads checking logic
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-touch.t
--- a/tests/test-touch.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-touch.t	Fri Oct 25 16:35:18 2024 +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 3c5966b42c21 -r 8da51e02b5d3 tests/test-uncommit-interactive.t
--- a/tests/test-uncommit-interactive.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-uncommit-interactive.t	Fri Oct 25 16:35:18 2024 +0400
@@ -45,7 +45,7 @@
   (enter ? for help) [Ynesfdaq?] q
   
   abort: user quit
-  [250]
+  [255]
   $ hg status
 
 Make a commit with multiple hunks
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-uncommit.t
--- a/tests/test-uncommit.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-uncommit.t	Fri Oct 25 16:35:18 2024 +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
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-unstability-resolution-result.t
--- a/tests/test-unstability-resolution-result.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-unstability-resolution-result.t	Fri Oct 25 16:35:18 2024 +0400
@@ -90,7 +90,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
   $ hg revert -r "orphan()" a
   $ hg diff
   diff -r 66719795a494 a
@@ -102,7 +102,7 @@
   +newer a
   $ hg evolve --continue
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [20]
+  [255]
   $ hg resolve -m a
   (no more unresolved files)
   continue: hg evolve --continue
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-userguide.t
--- a/tests/test-userguide.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-userguide.t	Fri Oct 25 16:35:18 2024 +0400
@@ -20,7 +20,7 @@
   $ hg commit --amend -u alice -d '1 0' -m 'implement feature Y'
   saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-42cc74d4-amend.hg (glob)
   $ hg log -r 23fe4ac6d3f1
-  abort: unknown revision '23fe4ac6d3f1'
+  abort: unknown revision '23fe4ac6d3f1'!
   [255]
   $ hg identify -in
   fe0ecd3bd2a4 1
@@ -38,7 +38,7 @@
   $ echo 'tweak feature Y' >> file1.c
   $ hg commit --amend -u alice -d '2 0' -m 'implement feature Y'
   $ hg shortlog -q -r fe0ecd3bd2a4
-  abort: hidden revision 'fe0ecd3bd2a4' was rewritten as: 934359450037
+  abort: hidden revision 'fe0ecd3bd2a4' was rewritten as: 934359450037!
   (use --hidden to access hidden revisions)
   [255]
   $ hg --hidden shortlog -G
diff -r 3c5966b42c21 -r 8da51e02b5d3 tests/test-wireproto.t
--- a/tests/test-wireproto.t	Fri Oct 25 16:31:50 2024 +0400
+++ b/tests/test-wireproto.t	Fri Oct 25 16:35:18 2024 +0400
@@ -200,7 +200,7 @@
 
   $ hg debugpushkey http://localhost:$HGPORT/ obsolete
   abort: HTTP Error 410: won't exchange obsmarkers through pushkey
-  [100]
+  [255]
   $ cat errors.log
   $ hg debugpushkey ssh://user@dummy/server obsolete
   remote: abort: won't exchange obsmarkers through pushkey