diff -r d5adce52cef4 -r 98941c28f3e2 tests/test-stabilize-result.t --- a/tests/test-stabilize-result.t Wed Mar 21 16:06:17 2018 +0100 +++ b/tests/test-stabilize-result.t Wed Mar 21 16:18:31 2018 +0100 @@ -27,31 +27,34 @@ (leaving bookmark changea) $ echo a >> a $ hg amend -m changea - 1 new orphan changesets + 1 new unstable changesets $ hg evolve -v --confirm move:[2] changea - atop:[3] changea + atop:[4] changea perform evolve? [Ny] n abort: evolve aborted by user [255] $ echo y | hg evolve -v --confirm --config ui.interactive=True move:[2] changea - atop:[3] changea + atop:[4] changea perform evolve? [Ny] y hg rebase -r cce2c55b8965 -d fb9d051ec0a4 resolving manifests $ glog --hidden - @ 3:fb9d051ec0a4@default(draft) bk:[changea] changea + @ 4:fb9d051ec0a4@default(draft) bk:[changea] changea | - | x 2:cce2c55b8965@default(draft) bk:[] changea + | x 3:c5727dbded3c@default(draft) bk:[] temporary amend commit for 102a90ea7b4a | | + | | x 2:cce2c55b8965@default(draft) bk:[] changea + | |/ | x 1:102a90ea7b4a@default(draft) bk:[] addb |/ o 0:07f494440405@default(draft) bk:[] adda $ hg debugobsolete - 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} - cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} + 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'ef1': '*', 'user': 'test'} (glob) + c5727dbded3c3a6877cf60d6bb552a76812cb844 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob) + cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} Test evolve with conflict @@ -70,13 +73,13 @@ $ hg gdown gdown have been deprecated in favor of previous 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - [3] changea + [4] changea $ echo 'a' > a $ hg amend - 1 new orphan changesets + 1 new unstable changesets $ hg evolve - move:[4] newer a - atop:[5] changea + move:[5] newer a + atop:[7] changea merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') evolve failed! @@ -93,14 +96,14 @@ +a +newer a $ hg evolve --continue - evolving 4:3655f0f50885 "newer a" + evolving 5:3655f0f50885 "newer a" abort: unresolved merge conflicts (see 'hg help resolve') [255] $ hg resolve -m a (no more unresolved files) continue: hg evolve --continue $ hg evolve --continue - evolving 4:3655f0f50885 "newer a" + evolving 5:3655f0f50885 "newer a" working directory is now at 1cf0aacfd363 Stabilize latecomer with different parent @@ -109,9 +112,9 @@ (the same-parent case is handled in test-evolve.t) $ glog - @ 6:1cf0aacfd363@default(draft) bk:[] newer a + @ 8:1cf0aacfd363@default(draft) bk:[] newer a | - o 5:66719795a494@default(draft) bk:[changea] changea + o 7:66719795a494@default(draft) bk:[changea] changea | o 0:07f494440405@default(draft) bk:[] adda @@ -120,7 +123,7 @@ $ hg gdown gdown have been deprecated in favor of previous 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - [5] changea + [7] changea $ echo 'c' > c $ hg add c $ hg commit -m 'add c' @@ -129,7 +132,7 @@ Get a successors of 8 on it $ hg grab 1cf0aacfd363 - grabbing 6:1cf0aacfd363 "newer a" + grabbing 8:1cf0aacfd363 "newer a" Add real change to the successors @@ -139,15 +142,15 @@ Make precursors public $ hg phase --hidden --public 1cf0aacfd363 - 1 new phase-divergent changesets + 1 new bumped changesets $ glog - @ 9:99c21c89bcef@default(draft) bk:[] newer a + @ 12:99c21c89bcef@default(draft) bk:[] newer a | - o 7:7bc2f5967f5e@default(draft) bk:[] add c + o 9:7bc2f5967f5e@default(draft) bk:[] add c | - | o 6:1cf0aacfd363@default(public) bk:[] newer a + | o 8:1cf0aacfd363@default(public) bk:[] newer a |/ - o 5:66719795a494@default(public) bk:[changea] changea + o 7:66719795a494@default(public) bk:[changea] changea | o 0:07f494440405@default(public) bk:[] adda @@ -155,34 +158,34 @@ Stabilize! $ hg evolve --any --dry-run --phase-divergent - recreate:[9] newer a - atop:[6] newer a + recreate:[12] newer a + atop:[8] newer a hg rebase --rev 99c21c89bcef --dest 66719795a494; hg update 1cf0aacfd363; hg revert --all --rev 99c21c89bcef; - hg commit --msg "phase-divergent update to 99c21c89bcef" + hg commit --msg "bumped update to 99c21c89bcef" $ hg evolve --any --confirm --phase-divergent - recreate:[9] newer a - atop:[6] newer a + recreate:[12] newer a + atop:[8] newer a perform evolve? [Ny] n abort: evolve aborted by user [255] $ echo y | hg evolve --any --confirm --config ui.interactive=True --phase-divergent - recreate:[9] newer a - atop:[6] newer a + recreate:[12] newer a + atop:[8] newer a perform evolve? [Ny] y rebasing to destination parent: 66719795a494 computing new diff - committed as 3d968e0b3097 - working directory is now at 3d968e0b3097 + committed as e34e87ea7b83 + working directory is now at e34e87ea7b83 $ glog - @ 11:3d968e0b3097@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: + @ 14:e34e87ea7b83@default(draft) bk:[] bumped update to 1cf0aacfd363: | - | o 7:7bc2f5967f5e@default(draft) bk:[] add c + | o 9:7bc2f5967f5e@default(draft) bk:[] add c | | - o | 6:1cf0aacfd363@default(public) bk:[] newer a + o | 8:1cf0aacfd363@default(public) bk:[] newer a |/ - o 5:66719795a494@default(public) bk:[changea] changea + o 7:66719795a494@default(public) bk:[changea] changea | o 0:07f494440405@default(public) bk:[] adda @@ -203,15 +206,15 @@ > EOF $ hg ci -m 'More addition' $ glog - @ 12:3932c176bbaa@default(draft) bk:[] More addition + @ 15:3932c176bbaa@default(draft) bk:[] More addition | - | o 11:3d968e0b3097@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: + | o 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re) | | - o | 7:7bc2f5967f5e@default(draft) bk:[] add c + o | 9:7bc2f5967f5e@default(draft) bk:[] add c | | - | o 6:1cf0aacfd363@default(public) bk:[] newer a + | o 8:1cf0aacfd363@default(public) bk:[] newer a |/ - o 5:66719795a494@default(public) bk:[changea] changea + o 7:66719795a494@default(public) bk:[changea] changea | o 0:07f494440405@default(public) bk:[] adda @@ -226,19 +229,19 @@ $ cat a.old >> a $ rm a.old $ hg amend - 2 new content-divergent changesets + 2 new divergent changesets $ glog - @ 14:eacc9c8240fe@default(draft) bk:[] More addition + @ 19:eacc9c8240fe@default(draft) bk:[] More addition | - | o 13:d2f173e25686@default(draft) bk:[] More addition + | o 17:d2f173e25686@default(draft) bk:[] More addition |/ - | o 11:3d968e0b3097@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: + | o 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re) | | - o | 7:7bc2f5967f5e@default(draft) bk:[] add c + o | 9:7bc2f5967f5e@default(draft) bk:[] add c | | - | o 6:1cf0aacfd363@default(public) bk:[] newer a + | o 8:1cf0aacfd363@default(public) bk:[] newer a |/ - o 5:66719795a494@default(public) bk:[changea] changea + o 7:66719795a494@default(public) bk:[changea] changea | o 0:07f494440405@default(public) bk:[] adda @@ -246,16 +249,16 @@ Stabilize it $ hg evolve -qn --confirm --content-divergent - merge:[14] More addition - with: [13] More addition - base: [12] More addition + merge:[19] More addition + with: [17] More addition + base: [15] More addition perform evolve? [Ny] n abort: evolve aborted by user [255] $ echo y | hg evolve -qn --confirm --config ui.interactive=True --content-divergent - merge:[14] More addition - with: [13] More addition - base: [12] More addition + merge:[19] More addition + with: [17] More addition + base: [15] More addition perform evolve? [Ny] y hg update -c eacc9c8240fe && hg merge d2f173e25686 && @@ -264,10 +267,10 @@ hg revert --all --rev tip && hg commit -m "`hg log -r eacc9c8240fe --template={desc}`"; $ hg evolve -v --content-divergent - merge:[14] More addition - with: [13] More addition - base: [12] More addition - merging content-divergent changeset + merge:[19] More addition + with: [17] More addition + base: [15] More addition + merging divergent changeset resolving manifests merging a 0 files updated, 1 files merged, 0 files removed, 0 files unresolved @@ -276,24 +279,29 @@ a committing manifest committing changelog - committed changeset 15:f344982e63c4 + copying changeset 283ccd10e2b8 to 7bc2f5967f5e + committing files: + a + committing manifest + committing changelog + committed changeset 21:f344982e63c4 working directory is now at f344982e63c4 $ hg st $ glog - @ 15:f344982e63c4@default(draft) bk:[] More addition + @ 21:f344982e63c4@default(draft) bk:[] More addition | - | o 11:3d968e0b3097@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: + | o 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re) | | - o | 7:7bc2f5967f5e@default(draft) bk:[] add c + o | 9:7bc2f5967f5e@default(draft) bk:[] add c | | - | o 6:1cf0aacfd363@default(public) bk:[] newer a + | o 8:1cf0aacfd363@default(public) bk:[] newer a |/ - o 5:66719795a494@default(public) bk:[changea] changea + o 7:66719795a494@default(public) bk:[changea] changea | o 0:07f494440405@default(public) bk:[] adda $ hg summary - parent: 15:f344982e63c4 tip + parent: 21:f344982e63c4 tip More addition branch: default commit: (clean) @@ -331,12 +339,12 @@ (use 'hg evolve' to update to its successor: f344982e63c4) $ echo 'gotta break' >> a $ hg amend - 2 new content-divergent changesets + 2 new divergent changesets # reamend so that the case is not the first precursor. $ hg amend -m "More addition (2)" $ hg phase 'contentdivergent()' - 15: draft - 17: draft + 21: draft + 24: draft $ hg evolve -qn --content-divergent hg update -c 0b336205a5d0 && hg merge f344982e63c4 && @@ -345,9 +353,9 @@ hg revert --all --rev tip && hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`"; $ hg evolve --content-divergent - merge:[17] More addition (2) - with: [15] More addition - base: [12] More addition + merge:[24] More addition (2) + with: [21] More addition + base: [15] More addition 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