--- a/tests/test-evolve-content-divergent-interrupted.t Wed Jun 05 17:46:06 2019 +0200
+++ b/tests/test-evolve-content-divergent-interrupted.t Wed Jun 05 17:56:44 2019 +0200
@@ -54,19 +54,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
@@ -128,7 +125,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
@@ -151,14 +148,12 @@
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo bar > c
$ hg amend
- 2 new orphan changesets
$ hg up ca1b80f7960a --hidden
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (ca1b80f7960a)
(use 'hg evolve' to update to its successor: 2ba73e31f264)
$ echo foobar > c
$ hg amend
- 2 new content-divergent changesets
$ echo bar > c
$ hg amend
@@ -167,13 +162,13 @@
| () draft
| x 9:7398f702a162 added c
|/ () draft
- | * 8:2ba73e31f264 added c
+ | o 8:2ba73e31f264 added c
|/ () draft
- | * 7:f0f1694f123e added d
+ | o 7:f0f1694f123e added d
| | () draft
| | x 6:9c1631e352d9 added d
| |/ () draft
- | | * 5:e49523854bc8 added d
+ | | o 5:e49523854bc8 added d
| |/ () draft
| | x 4:c41c793e0ef1 added d
| |/ () draft
@@ -201,7 +196,6 @@
[1]
$ hg evolve --abort
- 2 new content-divergent changesets
evolve aborted
working directory is now at 491e10505bae
@@ -210,13 +204,13 @@
| () draft
| x 9:7398f702a162 added c
|/ () draft
- | * 8:2ba73e31f264 added c
+ | o 8:2ba73e31f264 added c
|/ () draft
- | * 7:f0f1694f123e added d
+ | o 7:f0f1694f123e added d
| | () draft
| | x 6:9c1631e352d9 added d
| |/ () draft
- | | * 5:e49523854bc8 added d
+ | | o 5:e49523854bc8 added d
| |/ () draft
| | x 4:c41c793e0ef1 added d
| |/ () draft
@@ -230,7 +224,7 @@
() draft
$ hg obslog -r . --all
- * 2ba73e31f264 (8) added c
+ o 2ba73e31f264 (8) added c
|
| @ 491e10505bae (10) added c
| |
@@ -273,19 +267,16 @@
$ hg amend
$ hg up --hidden c41c793e0ef1
- updating to a hidden changeset c41c793e0ef1
- (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d)
2 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: 69bdd23a9b0d)
$ echo bar > d
$ hg amend
- 2 new content-divergent changesets
$ hg glog
@ 7:e49523854bc8 added d
| () draft
- | * 6:69bdd23a9b0d added d
+ | o 6:69bdd23a9b0d added d
| | () draft
o | 3:ca1b80f7960a added c
| | () draft
@@ -313,7 +304,7 @@
$ hg glog
@ 7:e49523854bc8 added d
| () draft
- | * 6:69bdd23a9b0d added d
+ | o 6:69bdd23a9b0d added d
| | () draft
o | 3:ca1b80f7960a added c
| | () draft
@@ -337,7 +328,7 @@
$ hg glog
@ 8:33e4442acf98 added d
| () draft
- | * 7:e49523854bc8 added d
+ | o 7:e49523854bc8 added d
| | () draft
| o 3:ca1b80f7960a added c
| | () draft
@@ -366,7 +357,7 @@
$ hg glog
@ 8:33e4442acf98 added d
| () draft
- | * 7:e49523854bc8 added d
+ | o 7:e49523854bc8 added d
| | () draft
| o 3:ca1b80f7960a added c
| | () draft
@@ -415,19 +406,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
@@ -457,7 +445,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
@@ -480,7 +468,7 @@
$ hg glog
@ 7:517d4375cb72 added d
| () draft
- | * 5:e49523854bc8 added d
+ | o 5:e49523854bc8 added d
| | () draft
| o 3:ca1b80f7960a added c
| | () draft
@@ -509,7 +497,7 @@
$ hg glog
@ 7:517d4375cb72 added d
| () draft
- | * 5:e49523854bc8 added d
+ | o 5:e49523854bc8 added d
| | () draft
| o 3:ca1b80f7960a added c
| | () draft
@@ -530,7 +518,7 @@
$ hg glog
@ 8:8fd1c4bd144c added d
| () draft
- | * 5:e49523854bc8 added d
+ | o 5:e49523854bc8 added d
| | () draft
| o 3:ca1b80f7960a added c
| | () draft
@@ -573,9 +561,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