--- a/tests/test-evolve-stop-orphan.t Thu Jun 14 02:58:30 2018 +0200
+++ b/tests/test-evolve-stop-orphan.t Fri Jun 15 00:16:29 2018 +0530
@@ -90,8 +90,8 @@
atop:[5] added c
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
- abort: fix conflicts and see `hg help evolve.interrupted`
- [255]
+ fix conflicts and see `hg help evolve.interrupted`
+ [1]
$ hg evolve --stop
stopped the interrupted evolve
@@ -136,8 +136,8 @@
atop:[5] added c
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
- abort: fix conflicts and see `hg help evolve.interrupted`
- [255]
+ fix conflicts and see `hg help evolve.interrupted`
+ [1]
$ hg diff
diff -r cb6a2ab625bb d
@@ -183,8 +183,8 @@
atop:[5] added c
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
- abort: fix conflicts and see `hg help evolve.interrupted`
- [255]
+ fix conflicts and see `hg help evolve.interrupted`
+ [1]
$ echo foo > d
$ hg resolve -m
(no more unresolved files)
@@ -234,8 +234,8 @@
atop:[9] added b
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
- abort: fix conflicts and see `hg help evolve.interrupted`
- [255]
+ fix conflicts and see `hg help evolve.interrupted`
+ [1]
$ hg status
M c
@@ -271,8 +271,8 @@
atop:[9] added b
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
- abort: fix conflicts and see `hg help evolve.interrupted`
- [255]
+ fix conflicts and see `hg help evolve.interrupted`
+ [1]
$ echo foobar > c
$ hg resolve -m
@@ -347,8 +347,8 @@
atop:[13] added b
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
- abort: fix conflicts and see `hg help evolve.interrupted`
- [255]
+ fix conflicts and see `hg help evolve.interrupted`
+ [1]
$ hg evolve --stop
stopped the interrupted evolve