--- a/tests/test-evolve-stop-contentdiv.t Fri Aug 03 00:19:47 2018 +0200
+++ b/tests/test-evolve-stop-contentdiv.t Fri Aug 03 00:22:50 2018 +0200
@@ -48,12 +48,16 @@
$ echo foobar > d
$ hg amend
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg glog --hidden
- @ 6:9c1631e352d9 added d
+ @ 8:9c1631e352d9 added d
| () draft
- | o 5:e49523854bc8 added d
- |/ () draft
+ | x 7:48ce7f604829 temporary amend commit for c41c793e0ef1
+ | | () draft
+ +---o 6:e49523854bc8 added d
+ | | () draft
+ | | x 5:14721514d41c temporary amend commit for c41c793e0ef1
+ | |/ () draft
| x 4:c41c793e0ef1 added d
|/ () draft
o 3:ca1b80f7960a added c
@@ -66,10 +70,10 @@
() draft
$ hg evolve --content-divergent
- merge:[6] added d
- with: [5] added d
+ merge:[8] added d
+ with: [6] added d
base: [4] added d
- merging "other" content-divergent changeset 'e49523854bc8'
+ merging "other" divergent changeset 'e49523854bc8'
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -81,10 +85,14 @@
working directory is now at 9c1631e352d9
$ hg glog --hidden
- @ 6:9c1631e352d9 added d
+ @ 8:9c1631e352d9 added d
| () draft
- | o 5:e49523854bc8 added d
- |/ () draft
+ | x 7:48ce7f604829 temporary amend commit for c41c793e0ef1
+ | | () draft
+ +---o 6:e49523854bc8 added d
+ | | () draft
+ | | x 5:14721514d41c temporary amend commit for c41c793e0ef1
+ | |/ () draft
| x 4:c41c793e0ef1 added d
|/ () draft
o 3:ca1b80f7960a added c
@@ -101,12 +109,12 @@
---------------------------------------------------------------------------
$ hg rebase -r . -d .^^^ --config extensions.rebase=
- rebasing 6:9c1631e352d9 "added d" (tip)
+ rebasing 8:9c1631e352d9 "added d" (tip)
$ hg glog
- @ 7:517d4375cb72 added d
+ @ 9:517d4375cb72 added d
| () draft
- | o 5:e49523854bc8 added d
+ | o 6:e49523854bc8 added d
| | () draft
| o 3:ca1b80f7960a added c
| | () draft
@@ -118,12 +126,12 @@
() draft
$ hg evolve --content-divergent
- merge:[5] added d
- with: [7] added d
+ merge:[6] added d
+ with: [9] added d
base: [4] added d
rebasing "other" content-divergent changeset 517d4375cb72 on ca1b80f7960a
updating to "local" side of the conflict: e49523854bc8
- merging "other" content-divergent changeset '606ad96040fc'
+ merging "other" divergent changeset '606ad96040fc'
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -135,9 +143,9 @@
working directory is now at 517d4375cb72
$ hg glog
- @ 7:517d4375cb72 added d
+ @ 9:517d4375cb72 added d
| () draft
- | o 5:e49523854bc8 added d
+ | o 6:e49523854bc8 added d
| | () draft
| o 3:ca1b80f7960a added c
| | () draft
@@ -156,9 +164,9 @@
$ hg add c
$ hg amend
$ hg glog
- @ 8:8fd1c4bd144c added d
+ @ 11:8fd1c4bd144c added d
| () draft
- | o 5:e49523854bc8 added d
+ | o 6:e49523854bc8 added d
| | () draft
| o 3:ca1b80f7960a added c
| | () draft
@@ -170,8 +178,8 @@
() draft
$ hg evolve --content-divergent
- merge:[5] added d
- with: [8] added d
+ merge:[6] added d
+ with: [11] added d
base: [4] added d
rebasing "other" content-divergent changeset 8fd1c4bd144c on ca1b80f7960a
merging c
@@ -201,9 +209,9 @@
XXX: we should have preserved the wdir to be at rev 8
$ hg glog
- o 8:8fd1c4bd144c added d
+ o 11:8fd1c4bd144c added d
| () draft
- | o 5:e49523854bc8 added d
+ | o 6:e49523854bc8 added d
| | () draft
| @ 3:ca1b80f7960a added c
| | () draft