--- a/tests/test-evolve-stop-contentdiv.t Tue Jan 22 12:55:09 2019 -0500
+++ b/tests/test-evolve-stop-contentdiv.t Tue Jan 22 12:57:25 2019 -0500
@@ -42,19 +42,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
@@ -85,7 +82,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
@@ -108,7 +105,7 @@
$ hg glog
@ 7:517d4375cb72 added d
| () draft
- | * 5:e49523854bc8 added d
+ | o 5:e49523854bc8 added d
| | () draft
| o 3:ca1b80f7960a added c
| | () draft
@@ -139,7 +136,7 @@
$ hg glog
@ 7:517d4375cb72 added d
| () draft
- | * 5:e49523854bc8 added d
+ | o 5:e49523854bc8 added d
| | () draft
| o 3:ca1b80f7960a added c
| | () draft
@@ -160,7 +157,7 @@
$ hg glog
@ 8:8fd1c4bd144c added d
| () draft
- | * 5:e49523854bc8 added d
+ | o 5:e49523854bc8 added d
| | () draft
| o 3:ca1b80f7960a added c
| | () draft
@@ -203,9 +200,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