diff tests/test-evolve-abort.t @ 3817:5ca297e78f2c mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4

--- a/tests/test-evolve-abort.t	Wed Apr 25 14:09:35 2018 +0100
+++ b/tests/test-evolve-abort.t	Fri Jun 08 22:52:52 2018 +0530
@@ -492,3 +492,24 @@
   |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft
+
+Testing `--abort` when conflicts are caused due to `hg next --evolve`
+=====================================================================
+
+  $ hg next --evolve
+  move:[2] added b
+  atop:[4] added a
+  working directory now at c1f4718020e3
+  $ hg next --evolve
+  move:[3] added c
+  atop:[5] added b
+  merging c
+  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
+  evolve failed!
+  fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
+  abort: unresolved merge conflicts (see hg help resolve)
+  [255]
+
+  $ hg evolve --abort
+  evolve aborted
+  working directory is now at c1f4718020e3