# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1434735865 25200
# Node ID 362e2c8c5677e49aa4fb8ef4e61d7ad133b3e5a5
# Parent  e12082872afc6be22d9d714a196461e0aa76f69f
evolve: add a hint about how to abort an evolve with conflict

The whole evolve --continue is hacky, but the way to abort it have been arcane
knowledge, carried from sith lord to its apprentice for centuries. We add a hint
to help the use discover it.

One day a clean solution will come.

diff -r e12082872afc -r 362e2c8c5677 hgext/evolve.py
--- a/hgext/evolve.py	Fri Jun 19 00:17:34 2015 -0700
+++ b/hgext/evolve.py	Fri Jun 19 10:44:25 2015 -0700
@@ -1392,7 +1392,8 @@
             repo.opener.write('graftstate', orig.hex() + '\n')
             repo.ui.write_err(_('evolve failed!\n'))
             repo.ui.write_err(
-                _('fix conflict and run "hg evolve --continue"\n'))
+                _('fix conflict and run "hg evolve --continue"'
+                  ' or use "hg update -C" to abort\n'))
             raise
 
 def _solvebumped(ui, repo, bumped, dryrun=False, confirm=False,
diff -r e12082872afc -r 362e2c8c5677 tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Fri Jun 19 00:17:34 2015 -0700
+++ b/tests/test-stabilize-conflict.t	Fri Jun 19 10:44:25 2015 -0700
@@ -130,7 +130,7 @@
   warning: conflicts during merge.
   merging babar incomplete! (edit conflicts, then use 'hg resolve --mark')
   evolve failed!
-  fix conflict and run "hg evolve --continue"
+  fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg resolve -l
@@ -220,7 +220,7 @@
   was merge successful (yn)? n
   merging babar failed!
   evolve failed!
-  fix conflict and run "hg evolve --continue"
+  fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg resolve -l
diff -r e12082872afc -r 362e2c8c5677 tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Fri Jun 19 00:17:34 2015 -0700
+++ b/tests/test-stabilize-result.t	Fri Jun 19 10:44:25 2015 -0700
@@ -85,7 +85,7 @@
   warning: conflicts during merge.
   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   evolve failed!
-  fix conflict and run "hg evolve --continue"
+  fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg revert -r 'unstable()' a