Mercurial > evolve

diff tests/test-stabilize-conflict.t @ 1395:362e2c8c5677 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 19 Jun 2015 10:44:25 -0700
parents 0c879e986ce4
children c4f8a2916e43
line wrap: on
line diff
--- 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