Mercurial > evolve

diff tests/test-evolve-continue.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 4544067b831b
children 8cf1020bd4f9
line wrap: on
line diff
--- a/tests/test-evolve-continue.t	Sun Jan 28 23:49:46 2018 +0530
+++ b/tests/test-evolve-continue.t	Mon Jan 29 00:09:44 2018 +0530
@@ -70,6 +70,7 @@
 
   $ hg evolve --continue
   evolving 4:c41c793e0ef1 "added d"
+  working directory is now at 2a4e03d422e2
 
   $ hg glog
   @  6:2a4e03d422e2 added d
@@ -172,6 +173,7 @@
   atop:[10] added b
   move:[8] added d
   atop:[11] added c
+  working directory is now at 6642d2c9176e
 
   $ hg glog
   @  12:6642d2c9176e added d
@@ -272,6 +274,7 @@
   continue: hg evolve --continue
   $ hg evolve --continue
   evolving 15:09becba8f97d "added h"
+  working directory is now at 3ba9d3d1b089
 
 Make sure, confirmopt is respected while continue
 
@@ -327,6 +330,7 @@
   move:[20] added h
   atop:[22] added g
   perform evolve? [Ny] y
+  working directory is now at af6bd002a48d
 
   $ hg glog
   @  23:af6bd002a48d added h