--- a/tests/test-evolve-issue5966.t Mon Dec 24 17:47:31 2018 +0100
+++ b/tests/test-evolve-issue5966.t Mon Dec 24 17:47:40 2018 +0100
@@ -40,15 +40,17 @@
$ echo apricot > a
$ hg amend -m 'apricot'
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg glog --hidden
- @ 4: apricot
+ @ 5: apricot
|
- | o 3: coconut
+ | x 4: temporary amend commit for 7f59f18ca4a9
| |
- | o 2: banana
- | |
+ | | o 3: coconut
+ | | |
+ | | o 2: banana
+ | |/
| x 1: apple
|/
o 0: empty
@@ -56,15 +58,15 @@
$ hg evolve -t :fail
move:[2] banana
- atop:[4] apricot
+ atop:[5] apricot
fix conflicts and see `hg help evolve.interrupted`
[1]
$ hg evolve --list
34a690fcf6ab: banana
- orphan: 7f59f18ca4a9 (obsolete parent)
+ unstable: 7f59f18ca4a9 (obsolete parent)
feb8c0bffa1f: coconut
- orphan: 34a690fcf6ab (orphan parent)
+ unstable: 34a690fcf6ab (unstable parent)
Evolve should detect unresolved conflict.
@@ -98,18 +100,18 @@
$ hg evolve
move:[3] coconut
- atop:[5] banana
+ atop:[6] banana
merging a
working directory is now at d77b4639fe26
All commit evolved
$ hg glog
- @ 6: coconut
+ @ 7: coconut
|
- o 5: banana
+ o 6: banana
|
- o 4: apricot
+ o 5: apricot
|
o 0: empty