diff tests/test-evolve-abort-orphan.t @ 3852:629558d09898

evolve: raise error.InterventionRequired instead of Abort when conflicts

error.InterventionRequired is a better error to raise in such cases.
Thanks to marmoute for noticing this.

--- a/tests/test-evolve-abort-orphan.t	Thu Jun 14 02:58:30 2018 +0200
+++ b/tests/test-evolve-abort-orphan.t	Fri Jun 15 00:16:29 2018 +0530
@@ -85,8 +85,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 --abort
   evolve aborted
@@ -117,8 +117,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)
@@ -145,8 +145,8 @@
   atop:[8] 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]
 
 testing that interrupted evolve shows up in morestatus
   $ hg status -v
@@ -256,8 +256,8 @@
   atop:[7] added a
   merging a
   warning: conflicts while merging a! (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 glog
   o  9:7f8e8bd9f0b6 added c
@@ -320,8 +320,8 @@
   atop:[7] added a
   merging a
   warning: conflicts while merging a! (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 glog
   o  9:7f8e8bd9f0b6 added c
   |   () draft
@@ -397,8 +397,8 @@
   atop:[7] added a
   merging a
   warning: conflicts while merging a! (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 glog
   o  12:1c476940790a added d
@@ -473,8 +473,8 @@
   atop:[5] 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 glog
   @  5:c1f4718020e3 added b
@@ -519,8 +519,8 @@
   atop:[5] 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 --abort
   evolve aborted