Mercurial > evolve

diff tests/test-evolve-phase.t @ 3472:05bd493d496d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: add evolve info to cmdutil.afterresolvedstates Adding evolve info to cmdutil.afterresolvedstate will improve the ui when we run into merge conflicts while evolving. Once we resolve all the conflicts using `hg resolve`, this will show a message saying "continue: hg evolve --continue". Other extensions like rebase and shelve also use it and it's very helpful.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 27 Jan 2018 21:15:27 +0530
parents d3a17c67f85c
children 14cd04ff968e
line wrap: on
line diff
--- a/tests/test-evolve-phase.t	Fri Jan 19 19:32:34 2018 +0530
+++ b/tests/test-evolve-phase.t	Sat Jan 27 21:15:27 2018 +0530
@@ -115,6 +115,7 @@
   $ echo c2 > a
   $ hg resolve -m
   (no more unresolved files)
+  continue: hg evolve --continue
   $ hg evolve -c
   evolving 2:13833940840c "c"