Mercurial > evolve

diff tests/test-stabilize-conflict.t @ 3494:14cd04ff968e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: show the updated working directory after `hg evolve --continue` `hg evolve` shows a nice message about the new working directory when the evolve ends but if the evolve is interrupted by conflicts and you continue the evolve resolving the conflicts, that nice message is lost. Let's have that in case of `--continue` too.
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 29 Jan 2018 00:09:44 +0530
parents 05bd493d496d
children d166b3dc5e8a
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t	Sun Jan 28 23:49:46 2018 +0530
+++ b/tests/test-stabilize-conflict.t	Mon Jan 29 00:09:44 2018 +0530
@@ -170,6 +170,7 @@
   continue: hg evolve --continue
   $ hg evolve --continue
   evolving 4:71c18f70c34f "babar count up to fifteen"
+  working directory is now at 1836b91c6c1d
   $ hg resolve -l
   $ hg log -G
   @  changeset:   6:1836b91c6c1d