--- a/tests/test-evolve-abort-phasediv.t Mon Dec 24 17:47:31 2018 +0100
+++ b/tests/test-evolve-abort-phasediv.t Mon Dec 24 17:47:40 2018 +0100
@@ -50,8 +50,10 @@
$ hg amend
$ hg glog --hidden
- @ 6:ddba58020bc0 added d
+ @ 7:ddba58020bc0 added d
| () draft
+ | x 6:7490b254b0eb temporary amend commit for cfe30edc6125
+ | | () draft
| x 5:cfe30edc6125 added d
|/ () draft
| x 4:c41c793e0ef1 added d
@@ -66,10 +68,10 @@
() draft
$ hg phase -r c41c793e0ef1 --public --hidden
- 1 new phase-divergent changesets
+ 1 new bumped changesets
$ hg glog
- @ 6:ddba58020bc0 added d
+ @ 7:ddba58020bc0 added d
| () draft
| o 4:c41c793e0ef1 added d
| | () public
@@ -82,7 +84,7 @@
o 0:8fa14d15e168 added hgignore
() public
$ hg evolve --phase-divergent
- recreate:[6] added d
+ recreate:[7] added d
atop:[4] added d
rebasing to destination parent: ca1b80f7960a
merging c
@@ -94,19 +96,6 @@
$ hg status -v
M c
A d
- # The repository is in an unfinished *evolve* state.
-
- # Unresolved merge conflicts:
- #
- # c
- #
- # To mark files as resolved: hg resolve --mark FILE
-
- # To continue: hg evolve --continue
- # To abort: hg evolve --abort
- # To stop: hg evolve --stop
- # (also see `hg help evolve.interrupted`)
-
$ hg parents
changeset: 3:ca1b80f7960a
@@ -114,12 +103,12 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: added c
- changeset: 6:ddba58020bc0
+ changeset: 7:ddba58020bc0
tag: tip
parent: 1:c7586e2a9264
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- instability: phase-divergent
+ trouble: bumped
summary: added d
@@ -128,7 +117,7 @@
working directory is now at ddba58020bc0
$ hg glog
- @ 6:ddba58020bc0 added d
+ @ 7:ddba58020bc0 added d
| () draft
| o 4:c41c793e0ef1 added d
| | () public
@@ -157,39 +146,45 @@
$ hg add b
$ hg amend
$ hg phase -r c41c793e0ef1 --public --hidden
- 2 new phase-divergent changesets
+ 2 new bumped changesets
$ hg evolve --list
e44ebefe4f54: added d
- phase-divergent: c41c793e0ef1 (immutable precursor)
+ bumped: c41c793e0ef1 (immutable precursor)
28cd06b3f801: added c
- phase-divergent: ca1b80f7960a (immutable precursor)
+ bumped: ca1b80f7960a (immutable precursor)
$ hg evolve --dry-run --all --phase-divergent
- recreate:[7] added d
+ recreate:[9] added d
atop:[4] added d
hg rebase --rev e44ebefe4f54 --dest ca1b80f7960a;
hg update c41c793e0ef1;
hg revert --all --rev e44ebefe4f54;
- hg commit --msg "phase-divergent update to e44ebefe4f54"
- recreate:[9] added c
+ hg commit --msg "bumped update to e44ebefe4f54"
+ recreate:[12] added c
atop:[3] added c
hg rebase --rev 28cd06b3f801 --dest b1661037fa25;
hg update ca1b80f7960a;
hg revert --all --rev 28cd06b3f801;
- hg commit --msg "phase-divergent update to 28cd06b3f801"
+ hg commit --msg "bumped update to 28cd06b3f801"
$ hg glog --hidden
- @ 9:28cd06b3f801 added c
+ @ 12:28cd06b3f801 added c
| () draft
- | x 8:9ff8adbe8a24 added c
+ | x 11:df2e1e03f9b3 temporary amend commit for 9ff8adbe8a24
+ | | () draft
+ | x 10:9ff8adbe8a24 added c
|/ () draft
- | o 7:e44ebefe4f54 added d
+ | o 9:e44ebefe4f54 added d
|/ () draft
- | x 6:ddba58020bc0 added d
+ | x 8:e8e0a6683006 temporary amend commit for ddba58020bc0
+ | | () draft
+ | x 7:ddba58020bc0 added d
|/ () draft
+ | x 6:7490b254b0eb temporary amend commit for cfe30edc6125
+ | | () draft
| x 5:cfe30edc6125 added d
|/ () draft
| o 4:c41c793e0ef1 added d
@@ -204,12 +199,12 @@
() public
$ hg evolve --phase-divergent --all
- recreate:[7] added d
+ recreate:[9] added d
atop:[4] added d
rebasing to destination parent: ca1b80f7960a
computing new diff
committed as c41c793e0ef1
- recreate:[9] added c
+ recreate:[12] added c
atop:[3] added c
rebasing to destination parent: b1661037fa25
merging b
@@ -222,14 +217,20 @@
working directory is now at 28cd06b3f801
$ hg glog --hidden
- @ 9:28cd06b3f801 added c
+ @ 12:28cd06b3f801 added c
| () draft
- | x 8:9ff8adbe8a24 added c
+ | x 11:df2e1e03f9b3 temporary amend commit for 9ff8adbe8a24
+ | | () draft
+ | x 10:9ff8adbe8a24 added c
|/ () draft
- | o 7:e44ebefe4f54 added d
+ | o 9:e44ebefe4f54 added d
|/ () draft
- | x 6:ddba58020bc0 added d
+ | x 8:e8e0a6683006 temporary amend commit for ddba58020bc0
+ | | () draft
+ | x 7:ddba58020bc0 added d
|/ () draft
+ | x 6:7490b254b0eb temporary amend commit for cfe30edc6125
+ | | () draft
| x 5:cfe30edc6125 added d
|/ () draft
| o 4:c41c793e0ef1 added d
@@ -253,16 +254,24 @@
$ hg amend
$ hg glog --hidden
- @ 10:ef9b72b9b42c added d
+ @ 14:ef9b72b9b42c added d
| () draft
- | o 9:28cd06b3f801 added c
+ | x 13:8d4b16b17719 temporary amend commit for e44ebefe4f54
+ | | () draft
+ +---o 12:28cd06b3f801 added c
+ | | () draft
+ | | x 11:df2e1e03f9b3 temporary amend commit for 9ff8adbe8a24
+ | | | () draft
+ +---x 10:9ff8adbe8a24 added c
+ | | () draft
+ | x 9:e44ebefe4f54 added d
|/ () draft
- | x 8:9ff8adbe8a24 added c
+ | x 8:e8e0a6683006 temporary amend commit for ddba58020bc0
+ | | () draft
+ | x 7:ddba58020bc0 added d
|/ () draft
- | x 7:e44ebefe4f54 added d
- |/ () draft
- | x 6:ddba58020bc0 added d
- |/ () draft
+ | x 6:7490b254b0eb temporary amend commit for cfe30edc6125
+ | | () draft
| x 5:cfe30edc6125 added d
|/ () draft
| o 4:c41c793e0ef1 added d
@@ -277,7 +286,7 @@
() public
$ hg evolve --phase-divergent --all
- recreate:[9] added c
+ recreate:[12] added c
atop:[3] added c
rebasing to destination parent: b1661037fa25
merging b
@@ -290,10 +299,10 @@
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
- evolving 9:28cd06b3f801 "added c"
+ evolving 12:28cd06b3f801 "added c"
computing new diff
- committed as 95d746965290
- recreate:[10] added d
+ committed as a71c993be085
+ recreate:[14] added d
atop:[4] added d
rebasing to destination parent: ca1b80f7960a
merging c
@@ -306,16 +315,24 @@
working directory is now at ef9b72b9b42c
$ hg glog --hidden
- @ 10:ef9b72b9b42c added d
+ @ 14:ef9b72b9b42c added d
| () draft
- | o 9:28cd06b3f801 added c
+ | x 13:8d4b16b17719 temporary amend commit for e44ebefe4f54
+ | | () draft
+ +---o 12:28cd06b3f801 added c
+ | | () draft
+ | | x 11:df2e1e03f9b3 temporary amend commit for 9ff8adbe8a24
+ | | | () draft
+ +---x 10:9ff8adbe8a24 added c
+ | | () draft
+ | x 9:e44ebefe4f54 added d
|/ () draft
- | x 8:9ff8adbe8a24 added c
+ | x 8:e8e0a6683006 temporary amend commit for ddba58020bc0
+ | | () draft
+ | x 7:ddba58020bc0 added d
|/ () draft
- | x 7:e44ebefe4f54 added d
- |/ () draft
- | x 6:ddba58020bc0 added d
- |/ () draft
+ | x 6:7490b254b0eb temporary amend commit for cfe30edc6125
+ | | () draft
| x 5:cfe30edc6125 added d
|/ () draft
| o 4:c41c793e0ef1 added d