--- a/tests/test-stabilize-result.t Wed Jul 25 15:30:37 2018 -0700
+++ b/tests/test-stabilize-result.t Tue Jul 31 12:52:06 2018 +0200
@@ -81,10 +81,8 @@
atop:[5] changea
merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
- evolve failed!
- fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
- abort: unresolved merge conflicts (see hg help resolve)
- [255]
+ fix conflicts and see `hg help evolve.interrupted`
+ [1]
$ hg revert -r "orphan()" a
$ hg diff
diff -r 66719795a494 a
@@ -239,9 +237,9 @@
$ echo 'babar' >> a
$ hg amend
$ hg up --hidden 3932c176bbaa
- updating to a hidden changeset 3932c176bbaa
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ updated to hidden changeset 3932c176bbaa
(hidden revision '3932c176bbaa' was rewritten as: d2f173e25686)
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (3932c176bbaa)
(use 'hg evolve' to update to its successor: d2f173e25686)
$ mv a a.old
@@ -290,20 +288,18 @@
merge:[14] More addition
with: [13] More addition
base: [12] More addition
- merging content-divergent changeset
+ merging "other" content-divergent changeset 'd2f173e25686'
resolving manifests
merging a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
- amending changeset eacc9c8240fe
committing files:
a
committing manifest
committing changelog
- committed changeset 15:f344982e63c4
- working directory is now at f344982e63c4
+ working directory is now at 4d6ed26797bc
$ hg st
$ glog
- @ 15:f344982e63c4@default(draft) bk:[] More addition
+ @ 15:4d6ed26797bc@default(draft) bk:[] More addition
|
| o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
| |
@@ -316,7 +312,7 @@
o 0:07f494440405@default(public) bk:[] adda
$ hg summary
- parent: 15:f344982e63c4 tip
+ parent: 15:4d6ed26797bc tip
More addition
branch: default
commit: (clean)
@@ -327,11 +323,11 @@
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID f344982e63c462b1e44c0371c804685389e673a9
+ # Node ID 4d6ed26797bc392c0099e48402a5134e669f1a60
# Parent 7bc2f5967f5e4ed277f60a89b7b04cc5d6407ced
More addition
- diff -r 7bc2f5967f5e -r f344982e63c4 a
+ diff -r 7bc2f5967f5e -r 4d6ed26797bc a
--- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,9 @@
@@ -349,11 +345,11 @@
-------------------------------------------------
$ hg up --hidden 3932c176bbaa
- updating to a hidden changeset 3932c176bbaa
- (hidden revision '3932c176bbaa' was rewritten as: f344982e63c4)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ updated to hidden changeset 3932c176bbaa
+ (hidden revision '3932c176bbaa' was rewritten as: 4d6ed26797bc)
working directory parent is obsolete! (3932c176bbaa)
- (use 'hg evolve' to update to its successor: f344982e63c4)
+ (use 'hg evolve' to update to its successor: 4d6ed26797bc)
$ echo 'gotta break' >> a
$ hg amend
2 new content-divergent changesets
@@ -362,10 +358,27 @@
$ hg phase 'contentdivergent()'
15: draft
17: draft
+
+ $ glog
+ @ 17:0b336205a5d0@default(draft) bk:[] More addition (2)
+ |
+ | * 15:4d6ed26797bc@default(draft) bk:[] More addition
+ |/
+ | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
+ | |
+ o | 7:7bc2f5967f5e@default(draft) bk:[] add c
+ | |
+ | o 6:1cf0aacfd363@default(public) bk:[] newer a
+ |/
+ o 5:66719795a494@default(public) bk:[changea] changea
+ |
+ o 0:07f494440405@default(public) bk:[] adda
+
+
$ hg evolve -qn --content-divergent
hg update -c 0b336205a5d0 &&
- hg merge f344982e63c4 &&
- hg commit -m "auto merge resolving conflict between 0b336205a5d0 and f344982e63c4"&&
+ hg merge 4d6ed26797bc &&
+ hg commit -m "auto merge resolving conflict between 0b336205a5d0 and 4d6ed26797bc"&&
hg up -C 3932c176bbaa &&
hg revert --all --rev tip &&
hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`";
@@ -373,16 +386,62 @@
merge:[17] More addition (2)
with: [15] More addition
base: [12] More addition
+ merging "other" content-divergent changeset '4d6ed26797bc'
merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
- use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abort
- abort: merge conflict between several amendments (this is not automated yet)
- (/!\ You can try:
- /!\ * manual merge + resolve => new cset X
- /!\ * hg up to the parent of the amended changeset (which are named W and Z)
- /!\ * hg revert --all -r X
- /!\ * hg ci -m "same message as the amended changeset" => new cset Y
- /!\ * hg prune -n Y W Z
- )
- [255]
+ fix conflicts and see `hg help evolve.interrupted`
+ [1]
+
+ $ cat > a <<EOF
+ > jungle
+ > a
+ > flore
+ > arthur
+ > zephir
+ > some
+ > less
+ > conflict
+ > babar
+ > EOF
+
+ $ hg resolve -m
+ (no more unresolved files)
+ continue: hg evolve --continue
+ $ hg evolve --continue
+ working directory is now at e8746835a2a1
+ $ glog
+ @ 18:e8746835a2a1@default(draft) bk:[] More addition (2)
+ |
+ | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
+ | |
+ o | 7:7bc2f5967f5e@default(draft) bk:[] add c
+ | |
+ | o 6:1cf0aacfd363@default(public) bk:[] newer a
+ |/
+ o 5:66719795a494@default(public) bk:[changea] changea
+ |
+ o 0:07f494440405@default(public) bk:[] adda
+
+ $ hg exp
+ # HG changeset patch
+ # User test
+ # Date 0 0
+ # Thu Jan 01 00:00:00 1970 +0000
+ # Node ID e8746835a2a13122bc8c0ed84fe4ee35649af25d
+ # Parent 7bc2f5967f5e4ed277f60a89b7b04cc5d6407ced
+ More addition (2)
+
+ diff -r 7bc2f5967f5e -r e8746835a2a1 a
+ --- a/a Thu Jan 01 00:00:00 1970 +0000
+ +++ b/a Thu Jan 01 00:00:00 1970 +0000
+ @@ -1,1 +1,9 @@
+ +jungle
+ a
+ +flore
+ +arthur
+ +zephir
+ +some
+ +less
+ +conflict
+ +babar