tests/test-stabilize-order.t
changeset 4577 bcd52ce0916d
parent 4576 96ce1030d2fb
child 4578 75e76141cba2
--- a/tests/test-stabilize-order.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-stabilize-order.t	Wed Apr 24 15:59:02 2019 +0200
@@ -72,11 +72,12 @@
   b
   committing manifest
   committing changelog
-  working directory is now at 81b8bbcd5892
+  resolving manifests
+  removing b
   $ glog
-  @  6:81b8bbcd5892@default(draft) addb
+  o  6:81b8bbcd5892@default(draft) addb
   |
-  o  5:005fe5914f78@default(draft) adda
+  @  5:005fe5914f78@default(draft) adda
   |
   | *  3:7a7552255fb5@default(draft) addc
   | |
@@ -89,8 +90,6 @@
 
 Test stabilizing a descendant predecessor's child
 
-  $ hg up -r 005fe5914f78
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg debugobsolete > successors.old
   $ hg evolve -v --update
   move:[3] addc