Mercurial > evolve

diff tests/test-evolve-content-divergent-relocation.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 7a5c6109ee84
children 61c2518cd6d2
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-relocation.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-content-divergent-relocation.t	Wed Apr 24 15:59:02 2019 +0200
@@ -109,13 +109,12 @@
   move:[3] added c
   atop:[8] added b
   move:[4] added d
-  working directory is now at 4ae4427ee9f8
   $ hg glog
-  @  10:4ae4427ee9f8 added d
+  o  10:4ae4427ee9f8 added d
   |   () [default] draft
   o  9:917281f93fcb added c
   |   () [default] draft
-  o  8:171614c9a791 added b
+  @  8:171614c9a791 added b
   |   () [default] draft
   o  1:c7586e2a9264 added a
   |   () [default] draft
@@ -124,8 +123,6 @@
 
 More testing!
 
-  $ hg up .^^
-  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo x > x
   $ hg ci -Aqm "added x"
   $ hg glog -r .