Mercurial > evolve

diff tests/test-evolve-topic.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 48521a49a07e
line wrap: on
line diff
--- a/tests/test-evolve-topic.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-topic.t	Wed Apr 24 15:59:02 2019 +0200
@@ -393,9 +393,6 @@
   move:[s3] add hhh
   move:[s4] add iii
   move:[s5] add jjj
-  working directory is now at 38a82cbb794a
-  $ hg up 18
-  0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   $ echo "changes in hhh" > hhh
   $ hg add hhh
   $ hg ci --amend
@@ -440,4 +437,4 @@
   move:[s4] add iii
   atop:[s3] add hhh
   move:[s5] add jjj
-  working directory is now at 119e4c126fb2
+  working directory is now at 2c295936ac04