tests/test-evolve-content-divergent-interrupted.t
branchmercurial-4.4
changeset 4553 aafd51f145ea
parent 4516 f54bb6eaf5e6
child 4675 79bc0f1a832e
--- a/tests/test-evolve-content-divergent-interrupted.t	Sat Apr 20 03:55:11 2019 +0200
+++ b/tests/test-evolve-content-divergent-interrupted.t	Tue Apr 23 12:28:32 2019 +0200
@@ -413,19 +413,16 @@
   $ hg amend
 
   $ hg up c41c793e0ef1 --hidden
-  updating to a hidden changeset c41c793e0ef1
-  (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (c41c793e0ef1)
   (use 'hg evolve' to update to its successor: e49523854bc8)
 
   $ echo foobar > d
   $ hg amend
-  2 new content-divergent changesets
   $ hg glog --hidden
   @  6:9c1631e352d9 added d
   |   () draft
-  | *  5:e49523854bc8 added d
+  | o  5:e49523854bc8 added d
   |/    () draft
   | x  4:c41c793e0ef1 added d
   |/    () draft
@@ -456,7 +453,7 @@
   $ hg glog --hidden
   @  6:9c1631e352d9 added d
   |   () draft
-  | *  5:e49523854bc8 added d
+  | o  5:e49523854bc8 added d
   |/    () draft
   | x  4:c41c793e0ef1 added d
   |/    () draft
@@ -479,7 +476,7 @@
   $ hg glog
   @  7:517d4375cb72 added d
   |   () draft
-  | *  5:e49523854bc8 added d
+  | o  5:e49523854bc8 added d
   | |   () draft
   | o  3:ca1b80f7960a added c
   | |   () draft
@@ -510,7 +507,7 @@
   $ hg glog
   @  7:517d4375cb72 added d
   |   () draft
-  | *  5:e49523854bc8 added d
+  | o  5:e49523854bc8 added d
   | |   () draft
   | o  3:ca1b80f7960a added c
   | |   () draft
@@ -531,7 +528,7 @@
   $ hg glog
   @  8:8fd1c4bd144c added d
   |   () draft
-  | *  5:e49523854bc8 added d
+  | o  5:e49523854bc8 added d
   | |   () draft
   | o  3:ca1b80f7960a added c
   | |   () draft
@@ -574,9 +571,9 @@
 
 XXX: we should have preserved the wdir to be at rev 8
   $ hg glog
-  *  8:8fd1c4bd144c added d
+  o  8:8fd1c4bd144c added d
   |   () draft
-  | *  5:e49523854bc8 added d
+  | o  5:e49523854bc8 added d
   | |   () draft
   | @  3:ca1b80f7960a added c
   | |   () draft