# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1611830916 -28800
# Node ID 8e4f6354b316d4f64158b01cc475a0daa7bbe180
# Parent  feb28638ec6c75733006d60c0e9c1835203ad7d0
tests: back out changeset b3d9e6c805d6

diff -r feb28638ec6c -r 8e4f6354b316 tests/test-amend-patch.t
--- a/tests/test-amend-patch.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-amend-patch.t	Thu Jan 28 18:48:36 2021 +0800
@@ -666,7 +666,7 @@
   $ hg add bar
   $ HGEDITOR=cat hg amend --patch
   abort: uncommitted changes
-  [20]
+  [255]
 
   $ hg revert --all
   forgetting bar
diff -r feb28638ec6c -r 8e4f6354b316 tests/test-evolve-abort-orphan.t
--- a/tests/test-evolve-abort-orphan.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-abort-orphan.t	Thu Jan 28 18:48:36 2021 +0800
@@ -56,7 +56,7 @@
 #else
   $ hg abort
   abort: no operation in progress
-  [20]
+  [255]
 #endif
 
 Testing with wrong combination of flags
@@ -101,7 +101,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
@@ -148,7 +148,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)
@@ -176,7 +176,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
@@ -288,7 +288,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
@@ -353,7 +353,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
@@ -431,7 +431,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
@@ -507,7 +507,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
@@ -554,7 +554,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg abort
   evolve aborted
diff -r feb28638ec6c -r 8e4f6354b316 tests/test-evolve-abort-phasediv.t
--- a/tests/test-evolve-abort-phasediv.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-abort-phasediv.t	Thu Jan 28 18:48:36 2021 +0800
@@ -97,7 +97,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
@@ -216,7 +216,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
@@ -286,7 +286,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
@@ -302,7 +302,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 feb28638ec6c -r 8e4f6354b316 tests/test-evolve-content-divergent-basic.t
--- a/tests/test-evolve-content-divergent-basic.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-content-divergent-basic.t	Thu Jan 28 18:48:36 2021 +0800
@@ -344,7 +344,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
@@ -404,7 +404,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
@@ -615,7 +615,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 feb28638ec6c -r 8e4f6354b316 tests/test-evolve-content-divergent-interrupted.t
--- a/tests/test-evolve-content-divergent-interrupted.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-content-divergent-interrupted.t	Thu Jan 28 18:48:36 2021 +0800
@@ -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
@@ -314,7 +314,7 @@
   1 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg evolve --abort
   evolve aborted
@@ -368,7 +368,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
   evolve aborted
@@ -460,7 +460,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
@@ -513,7 +513,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
@@ -568,7 +568,7 @@
   0 files updated, 0 files merged, 0 files removed, 2 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg diff
   diff -r 517d4375cb72 c
diff -r feb28638ec6c -r 8e4f6354b316 tests/test-evolve-content-divergent-relocation.t
--- a/tests/test-evolve-content-divergent-relocation.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-content-divergent-relocation.t	Thu Jan 28 18:48:36 2021 +0800
@@ -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 26dd4974d99f 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 5049972c0e21 y
diff -r feb28638ec6c -r 8e4f6354b316 tests/test-evolve-content-divergent-stack.t
--- a/tests/test-evolve-content-divergent-stack.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-content-divergent-stack.t	Thu Jan 28 18:48:36 2021 +0800
@@ -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 res -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 res -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 res -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 res -m
diff -r feb28638ec6c -r 8e4f6354b316 tests/test-evolve-continue.t
--- a/tests/test-evolve-continue.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-continue.t	Thu Jan 28 18:48:36 2021 +0800
@@ -60,7 +60,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
@@ -120,7 +120,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
@@ -160,7 +160,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
@@ -245,7 +245,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
@@ -260,7 +260,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
@@ -307,7 +307,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
@@ -356,7 +356,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)
@@ -423,7 +423,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')
@@ -453,7 +453,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 feb28638ec6c -r 8e4f6354b316 tests/test-evolve-issue5966.t
--- a/tests/test-evolve-issue5966.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-issue5966.t	Thu Jan 28 18:48:36 2021 +0800
@@ -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)
diff -r feb28638ec6c -r 8e4f6354b316 tests/test-evolve-issue5967.t
--- a/tests/test-evolve-issue5967.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-issue5967.t	Thu Jan 28 18:48:36 2021 +0800
@@ -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 feb28638ec6c -r 8e4f6354b316 tests/test-evolve-orphan-merge.t
--- a/tests/test-evolve-orphan-merge.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-orphan-merge.t	Thu Jan 28 18:48:36 2021 +0800
@@ -210,7 +210,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
@@ -266,7 +266,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 feb28638ec6c -r 8e4f6354b316 tests/test-evolve-phase-divergence.t
--- a/tests/test-evolve-phase-divergence.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-phase-divergence.t	Thu Jan 28 18:48:36 2021 +0800
@@ -860,7 +860,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 8c2bb6fb44e9 l
diff -r feb28638ec6c -r 8e4f6354b316 tests/test-evolve-phase.t
--- a/tests/test-evolve-phase.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-phase.t	Thu Jan 28 18:48:36 2021 +0800
@@ -87,7 +87,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 feb28638ec6c -r 8e4f6354b316 tests/test-evolve-progress.t
--- a/tests/test-evolve-progress.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-progress.t	Thu Jan 28 18:48:36 2021 +0800
@@ -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 feb28638ec6c -r 8e4f6354b316 tests/test-evolve-public-content-divergent-corner-cases.t
--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Thu Jan 28 18:48:36 2021 +0800
@@ -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 
diff -r feb28638ec6c -r 8e4f6354b316 tests/test-evolve-public-content-divergent-discard.t
--- a/tests/test-evolve-public-content-divergent-discard.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-public-content-divergent-discard.t	Thu Jan 28 18:48:36 2021 +0800
@@ -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 res -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 res -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 res -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 res -m
diff -r feb28638ec6c -r 8e4f6354b316 tests/test-evolve-public-content-divergent-main.t
--- a/tests/test-evolve-public-content-divergent-main.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-public-content-divergent-main.t	Thu Jan 28 18:48:36 2021 +0800
@@ -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 res -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 res -m
diff -r feb28638ec6c -r 8e4f6354b316 tests/test-evolve-serveronly-legacy.t
--- a/tests/test-evolve-serveronly-legacy.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-serveronly-legacy.t	Thu Jan 28 18:48:36 2021 +0800
@@ -59,5 +59,5 @@
   abort: remote error:
   incompatible Mercurial client; bundle2 required
   (see https://www.mercurial-scm.org/wiki/IncompatibleClient)
-  [100]
+  [255]
   $ cat ../errors.log
diff -r feb28638ec6c -r 8e4f6354b316 tests/test-evolve-stop-orphan.t
--- a/tests/test-evolve-stop-orphan.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-stop-orphan.t	Thu Jan 28 18:48:36 2021 +0800
@@ -92,7 +92,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
@@ -138,7 +138,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
@@ -200,7 +200,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)
@@ -250,7 +250,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
@@ -288,7 +288,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
@@ -363,7 +363,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 feb28638ec6c -r 8e4f6354b316 tests/test-evolve-stop-phasediv.t
--- a/tests/test-evolve-stop-phasediv.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-stop-phasediv.t	Thu Jan 28 18:48:36 2021 +0800
@@ -86,7 +86,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 feb28638ec6c -r 8e4f6354b316 tests/test-evolve-topic.t
--- a/tests/test-evolve-topic.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-topic.t	Thu Jan 28 18:48:36 2021 +0800
@@ -428,7 +428,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 feb28638ec6c -r 8e4f6354b316 tests/test-evolve.t
--- a/tests/test-evolve.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve.t	Thu Jan 28 18:48:36 2021 +0800
@@ -645,7 +645,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
@@ -1411,7 +1411,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:b9acdb1af6d5@default(draft) will be evolved safely
diff -r feb28638ec6c -r 8e4f6354b316 tests/test-issue-5720.t
--- a/tests/test-issue-5720.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-issue-5720.t	Thu Jan 28 18:48:36 2021 +0800
@@ -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 feb28638ec6c -r 8e4f6354b316 tests/test-obsolete.t
--- a/tests/test-obsolete.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-obsolete.t	Thu Jan 28 18:48:36 2021 +0800
@@ -175,7 +175,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
diff -r feb28638ec6c -r 8e4f6354b316 tests/test-pick.t
--- a/tests/test-pick.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-pick.t	Thu Jan 28 18:48:36 2021 +0800
@@ -90,7 +90,7 @@
 #if abortcommand
   $ hg abort
   abort: no operation in progress
-  [20]
+  [255]
 #endif
 
 Specifying both continue and revs
@@ -197,7 +197,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
@@ -235,7 +235,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)
@@ -260,7 +260,7 @@
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
-  [240]
+  [1]
 
 #if abortcommand
   $ hg abort --dry-run
@@ -320,7 +320,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
@@ -459,7 +459,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 feb28638ec6c -r 8e4f6354b316 tests/test-prev-next.t
--- a/tests/test-prev-next.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-prev-next.t	Thu Jan 28 18:48:36 2021 +0800
@@ -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
@@ -380,7 +380,7 @@
   $ hg next --evolve
   abort: uncommitted changes
   (use `hg amend`, `hg revert` or `hg shelve`)
-  [20]
+  [255]
 
   $ cd ..
 
@@ -471,7 +471,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.
@@ -492,7 +492,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')
diff -r feb28638ec6c -r 8e4f6354b316 tests/test-rewind.t
--- a/tests/test-rewind.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-rewind.t	Thu Jan 28 18:48:36 2021 +0800
@@ -1191,10 +1191,10 @@
 
   $ 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]
diff -r feb28638ec6c -r 8e4f6354b316 tests/test-split.t
--- a/tests/test-split.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-split.t	Thu Jan 28 18:48:36 2021 +0800
@@ -138,7 +138,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
 
diff -r feb28638ec6c -r 8e4f6354b316 tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-stabilize-conflict.t	Thu Jan 28 18:48:36 2021 +0800
@@ -130,7 +130,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
@@ -223,7 +223,7 @@
   merging babar failed!
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
   $ hg resolve -l
   U babar
   $ hg log -G
diff -r feb28638ec6c -r 8e4f6354b316 tests/test-topic-rebase.t
--- a/tests/test-topic-rebase.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-topic-rebase.t	Thu Jan 28 18:48:36 2021 +0800
@@ -128,7 +128,7 @@
   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
diff -r feb28638ec6c -r 8e4f6354b316 tests/test-topic.t
--- a/tests/test-topic.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-topic.t	Thu Jan 28 18:48:36 2021 +0800
@@ -271,16 +271,16 @@
 
   $ 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 name cannot consist entirely of whitespaces
   [255]
@@ -317,7 +317,7 @@
   HG: branch 'default'
   HG: changed alpha
   abort: empty commit message
-  [10]
+  [255]
   $ hg revert alpha
   $ hg topic
    * topicflag (0 changesets)
diff -r feb28638ec6c -r 8e4f6354b316 tests/test-unstability-resolution-result.t
--- a/tests/test-unstability-resolution-result.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-unstability-resolution-result.t	Thu Jan 28 18:48:36 2021 +0800
@@ -92,7 +92,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
diff -r feb28638ec6c -r 8e4f6354b316 tests/test-wireproto.t
--- a/tests/test-wireproto.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-wireproto.t	Thu Jan 28 18:48:36 2021 +0800
@@ -202,7 +202,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