Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-stop-orphan.t
changeset 4577 bcd52ce0916d
parent 4576 96ce1030d2fb
child 4671 63a816beee7e
child 4676 b6c819facbe8 
--- a/tests/test-evolve-stop-orphan.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-evolve-stop-orphan.t	Wed Apr 24 15:59:02 2019 +0200
@@ -293,13 +293,13 @@
   evolving 5:cb6a2ab625bb "added c"
   move:[6] added d
   atop:[10] added c
-  working directory is now at cd0909a30222
+  working directory is now at aec285328e90
   $ hg glog
-  @  11:cd0909a30222 added d
+  o  11:cd0909a30222 added d
   |   () draft
   o  10:cb1dd1086ef6 added c
   |   () draft
-  o  9:aec285328e90 added b
+  @  9:aec285328e90 added b
   |   () draft
   o  8:fd00db71edca added a
   |   () draft
@@ -310,8 +310,8 @@
 bookmarks of rest of them should stay where they are are
 -------------------------------------------------------------------------
 
-  $ hg up .^
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg up tip^
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bookmark b1
   $ hg up .^
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
evolve