Mercurial > evolve

diff tests/test-evolve-issue5966.t @ 4577:bcd52ce0916d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: don't update after instability resolution by default (BC)
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 24 Apr 2019 15:59:02 +0200
parents 8aa28e68ac44
children e6d7d261ca4a
line wrap: on
line diff
--- a/tests/test-evolve-issue5966.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-issue5966.t	Wed Apr 24 15:59:02 2019 +0200
@@ -91,7 +91,7 @@
   R a
   $ hg evolve --continue
   evolving 2:34a690fcf6ab "banana"
-  working directory is now at e4207a610ed0
+  working directory is now at 581a2bb4704c
   $ hg resolve --list
 
 evolve the rest of the stack
@@ -100,16 +100,15 @@
   move:[3] coconut
   atop:[5] banana
   merging a
-  working directory is now at d77b4639fe26
 
 All commit evolved
 
   $ hg glog
-  @  6: coconut
+  o  6: coconut
   |
   o  5: banana
   |
-  o  4: apricot
+  @  4: apricot
   |
   o  0: empty