Mercurial > evolve

diff tests/test-evolve-public-content-divergent-main.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 96ce1030d2fb
children a4fde4e3e763
line wrap: on
line diff
--- a/tests/test-evolve-public-content-divergent-main.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-public-content-divergent-main.t	Wed Apr 24 15:59:02 2019 +0200
@@ -506,7 +506,7 @@
 
   $ hg evolve --continue
   committed as 2a0f44767904
-  working directory is now at 2a0f44767904
+  working directory is now at 93cd84bbdaca
 
   $ hg evolve -l
   $ cd ..
@@ -634,7 +634,7 @@
 
   $ hg evolve --continue
   committed as b9082a9e66ce
-  working directory is now at b9082a9e66ce
+  working directory is now at 93cd84bbdaca
 
   $ hg evolve -l
   $ cd ..