diff -r 9af0e2b0bdd7 -r 537fd9a86c06 tests/test-evolve-content-divergence.t --- a/tests/test-evolve-content-divergence.t Fri Aug 03 00:19:47 2018 +0200 +++ b/tests/test-evolve-content-divergence.t Fri Aug 03 00:22:50 2018 +0200 @@ -47,12 +47,12 @@ $ hg branch watwat marked working directory as branch watwat $ hg amend - 2 new content-divergent changesets + 2 new divergent changesets $ hg glog - @ 6:264b04f771fb added d + @ 8:264b04f771fb added d | () [watwat] draft - | o 5:bdeedce1f621 added d + | o 6:bdeedce1f621 added d |/ () [foobar] draft o 3:ca1b80f7960a added c | () [default] draft @@ -66,17 +66,17 @@ $ hg evolve --content-divergent --config ui.interactive=True< c > EOF - 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 'bdeedce1f621' + merging "other" divergent changeset 'bdeedce1f621' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved content divergent changesets on different branches. choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar? c working directory is now at 0ac42f1bc15c $ hg glog - @ 7:0ac42f1bc15c added d + @ 9:0ac42f1bc15c added d | () [foobar] draft o 3:ca1b80f7960a added c | () [default] draft @@ -104,12 +104,12 @@ $ hg prune -r 0ac42f1bc15c -s . --hidden 1 changesets pruned - 2 new content-divergent changesets + 2 new divergent changesets $ hg glog - @ 9:59081c9c425a added a d with bar in it, expect some beers + @ 12:59081c9c425a added a d with bar in it, expect some beers | () [default] draft - | o 8:f621d00f5f0e added d + | o 11:f621d00f5f0e added d |/ () [foobar] draft o 3:ca1b80f7960a added c | () [default] draft @@ -121,15 +121,15 @@ () [default] draft $ hg evolve --content-divergent - merge:[9] added a d with bar in it, expect some beers - with: [8] added d - base: [7] added d - merging "other" content-divergent changeset 'f621d00f5f0e' + merge:[12] added a d with bar in it, expect some beers + with: [11] added d + base: [9] added d + merging "other" divergent changeset 'f621d00f5f0e' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory is now at a9d6fd6b5e40 $ hg glog - @ 10:a9d6fd6b5e40 added a d with bar in it, expect some beers + @ 13:a9d6fd6b5e40 added a d with bar in it, expect some beers | () [default] draft o 3:ca1b80f7960a added c | () [default] draft @@ -151,12 +151,12 @@ (use 'hg evolve' to update to its successor: b10b07a394f1) $ echo babar > d $ hg amend -m "foo to d" - 2 new content-divergent changesets + 2 new divergent changesets $ hg glog - @ 12:0bb497fed24a foo to d + @ 17:0bb497fed24a foo to d | () [default] draft - | o 11:b10b07a394f1 foo to d + | o 15:b10b07a394f1 foo to d |/ () [default] draft o 3:ca1b80f7960a added c | () [default] draft @@ -168,10 +168,10 @@ () [default] draft $ hg evolve --content-divergent - merge:[12] foo to d - with: [11] foo to d - base: [10] added a d with bar in it, expect some beers - merging "other" content-divergent changeset 'b10b07a394f1' + merge:[17] foo to d + with: [15] foo to d + base: [13] added a d with bar in it, expect some beers + merging "other" divergent changeset 'b10b07a394f1' 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 @@ -186,7 +186,7 @@ working directory is now at 11175423b5dc $ hg glog - @ 13:11175423b5dc foo to d + @ 18:11175423b5dc foo to d | () [default] draft o 3:ca1b80f7960a added c | () [default] draft @@ -209,12 +209,12 @@ (use 'hg evolve' to update to its successor: 27f0463f169a) $ echo wat > d $ hg amend -m "wat to d, wat?" - 2 new content-divergent changesets + 2 new divergent changesets $ hg glog - @ 15:f542037ddf31 wat to d, wat? + @ 22:f542037ddf31 wat to d, wat? | () [default] draft - | o 14:27f0463f169a bar to d, expect beers + | o 20:27f0463f169a bar to d, expect beers |/ () [default] draft o 3:ca1b80f7960a added c | () [default] draft @@ -226,10 +226,10 @@ () [default] draft $ hg evolve --content-divergent - merge:[15] wat to d, wat? - with: [14] bar to d, expect beers - base: [13] foo to d - merging "other" content-divergent changeset '27f0463f169a' + merge:[22] wat to d, wat? + with: [20] bar to d, expect beers + base: [18] foo to d + merging "other" divergent changeset '27f0463f169a' 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 @@ -267,7 +267,7 @@ working directory is now at 89ea3eee2d69 $ hg glog - @ 16:89ea3eee2d69 watbar to d + @ 23:89ea3eee2d69 watbar to d | () [default] draft o 3:ca1b80f7960a added c | () [default] draft @@ -307,16 +307,16 @@ 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ echo bar > b $ hg amend - 2 new orphan changesets + 2 new unstable changesets - $ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True + $ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True --config experimental.allowdivergence=True rebasing 2:b1661037fa25 "added b" - 2 new content-divergent changesets + 2 new divergent changesets $ hg glog - o 6:da4b96f4a8d6 added b + o 7:da4b96f4a8d6 added b | () [default] draft - | @ 5:7ed0642d644b added b + | @ 6:7ed0642d644b added b | | () [default] draft | | o 4:c41c793e0ef1 added d | | | () [default] draft @@ -330,17 +330,17 @@ () [default] draft $ hg evolve --content-divergent - merge:[5] added b - with: [6] added b + merge:[6] added b + with: [7] added b base: [2] added b rebasing "other" content-divergent changeset da4b96f4a8d6 on c7586e2a9264 updating to "local" side of the conflict: 7ed0642d644b - merging "other" content-divergent changeset '11f849d7159f' + merging "other" divergent changeset '11f849d7159f' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory is now at 171614c9a791 $ hg glog - @ 8:171614c9a791 added b + @ 9:171614c9a791 added b | () [default] draft | o 4:c41c793e0ef1 added d | | () [default] draft @@ -372,16 +372,16 @@ $ hg evolve --all move:[3] added c - atop:[8] added b + atop:[9] added b move:[4] added d - atop:[9] added c + atop:[10] added c working directory is now at 4ae4427ee9f8 $ hg glog - @ 10:4ae4427ee9f8 added d + @ 11:4ae4427ee9f8 added d | () [default] draft - o 9:917281f93fcb added c + o 10:917281f93fcb added c | () [default] draft - o 8:171614c9a791 added b + o 9:171614c9a791 added b | () [default] draft o 1:c7586e2a9264 added a | () [default] draft @@ -395,7 +395,7 @@ $ echo x > x $ hg ci -Aqm "added x" $ hg glog -r . - @ 11:71a392c714b5 added x + @ 12:71a392c714b5 added x | () [default] draft ~ @@ -409,20 +409,20 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (71a392c714b5) (use 'hg evolve' to update to its successor: 1e1a50385a7d) - $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True - rebasing 11:71a392c714b5 "added x" - 2 new content-divergent changesets + $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True --config experimental.allowdivergence=True + rebasing 12:71a392c714b5 "added x" + 2 new divergent changesets $ hg glog - @ 13:1e4f6b3bb39b added x + @ 15:1e4f6b3bb39b added x | () [default] draft - | o 12:1e1a50385a7d added foo to x + | o 14:1e1a50385a7d added foo to x | | () [bar] draft - o | 10:4ae4427ee9f8 added d + o | 11:4ae4427ee9f8 added d | | () [default] draft - o | 9:917281f93fcb added c + o | 10:917281f93fcb added c |/ () [default] draft - o 8:171614c9a791 added b + o 9:171614c9a791 added b | () [default] draft o 1:c7586e2a9264 added a | () [default] draft @@ -430,12 +430,12 @@ () [default] draft $ hg evolve --content-divergent - merge:[13] added x - with: [12] added foo to x - base: [11] added x + merge:[15] added x + with: [14] added foo to x + base: [12] added x rebasing "other" content-divergent changeset 1e1a50385a7d on 4ae4427ee9f8 updating to "local" side of the conflict: 1e4f6b3bb39b - merging "other" content-divergent changeset '80cc9b1ec650' + merging "other" divergent changeset '80cc9b1ec650' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory is now at b006cf317e0e @@ -458,13 +458,13 @@ The above `hg exp` and the following log call demonstrates that message, content and branch change is preserved in case of relocation $ hg glog - @ 15:b006cf317e0e added foo to x + @ 17:b006cf317e0e added foo to x | () [bar] draft - o 10:4ae4427ee9f8 added d + o 11:4ae4427ee9f8 added d | () [default] draft - o 9:917281f93fcb added c + o 10:917281f93fcb added c | () [default] draft - o 8:171614c9a791 added b + o 9:171614c9a791 added b | () [default] draft o 1:c7586e2a9264 added a | () [default] draft @@ -481,7 +481,7 @@ $ echo y > y $ hg ci -Aqm "added y" $ hg glog -r . - @ 16:fc6ad2bac162 added y + @ 18:fc6ad2bac162 added y | () [default] draft ~ @@ -492,24 +492,24 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (fc6ad2bac162) (use 'hg evolve' to update to its successor: 2a9f6ccbdeba) - $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True - rebasing 16:fc6ad2bac162 "added y" - 2 new content-divergent changesets + $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True --config experimental.allowdivergence=True + rebasing 18:fc6ad2bac162 "added y" + 2 new divergent changesets $ echo wat > y $ hg amend $ hg glog - @ 19:b4575ed6fcfc added y + @ 23:b4575ed6fcfc added y | () [bar] draft - | o 17:2a9f6ccbdeba added y + | o 20:2a9f6ccbdeba added y | | () [default] draft - o | 15:b006cf317e0e added foo to x + o | 17:b006cf317e0e added foo to x | | () [bar] draft - o | 10:4ae4427ee9f8 added d + o | 11:4ae4427ee9f8 added d | | () [default] draft - o | 9:917281f93fcb added c + o | 10:917281f93fcb added c |/ () [default] draft - o 8:171614c9a791 added b + o 9:171614c9a791 added b | () [default] draft o 1:c7586e2a9264 added a | () [default] draft @@ -517,12 +517,12 @@ () [default] draft $ hg evolve --content-divergent - merge:[19] added y - with: [17] added y - base: [16] added y + merge:[23] added y + with: [20] added y + base: [18] added y rebasing "other" content-divergent changeset 2a9f6ccbdeba on b006cf317e0e updating to "local" side of the conflict: b4575ed6fcfc - merging "other" content-divergent changeset '48f745db3f53' + merging "other" divergent changeset '48f745db3f53' merging y warning: conflicts while merging y! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved @@ -537,15 +537,15 @@ working directory is now at 7bbcf24ddecf $ hg glog - @ 21:7bbcf24ddecf added y + @ 25:7bbcf24ddecf added y | () [bar] draft - o 15:b006cf317e0e added foo to x + o 17:b006cf317e0e added foo to x | () [bar] draft - o 10:4ae4427ee9f8 added d + o 11:4ae4427ee9f8 added d | () [default] draft - o 9:917281f93fcb added c + o 10:917281f93fcb added c | () [default] draft - o 8:171614c9a791 added b + o 9:171614c9a791 added b | () [default] draft o 1:c7586e2a9264 added a | () [default] draft @@ -553,23 +553,23 @@ () [default] draft $ hg obslog -r . --all - @ 7bbcf24ddecf (21) added y + @ 7bbcf24ddecf (25) added y |\ - x | 48f745db3f53 (20) added y - | | rewritten(branch, content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + x | 48f745db3f53 (24) added y + | | rewritten(branch, content) as 7bbcf24ddecf by test (Thu Jan 01 00:00:00 1970 +0000) | | - | x b4575ed6fcfc (19) added y - | | rewritten(content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | x b4575ed6fcfc (23) added y + | | rewritten(content) as 7bbcf24ddecf by test (Thu Jan 01 00:00:00 1970 +0000) | | - x | 2a9f6ccbdeba (17) added y - | | rewritten(parent) as 48f745db3f53 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + x | 2a9f6ccbdeba (20) added y + | | rewritten(parent) as 48f745db3f53 by test (Thu Jan 01 00:00:00 1970 +0000) | | - | x 96b677f01b81 (18) added y - |/ rewritten(content) as b4575ed6fcfc using amend by test (Thu Jan 01 00:00:00 1970 +0000) + | x 96b677f01b81 (21) added y + |/ rewritten(content) as b4575ed6fcfc by test (Thu Jan 01 00:00:00 1970 +0000) | - x fc6ad2bac162 (16) added y - rewritten(content) as 2a9f6ccbdeba using amend by test (Thu Jan 01 00:00:00 1970 +0000) - rewritten(branch, parent) as 96b677f01b81 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) + x fc6ad2bac162 (18) added y + rewritten(content) as 2a9f6ccbdeba by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(branch, parent) as 96b677f01b81 by test (Thu Jan 01 00:00:00 1970 +0000) checking that relocated commit is there @@ -592,15 +592,15 @@ ---------------------------------------------------------------------- $ hg glog - @ 21:7bbcf24ddecf added y + @ 25:7bbcf24ddecf added y | () [bar] draft - o 15:b006cf317e0e added foo to x + o 17:b006cf317e0e added foo to x | () [bar] draft - o 10:4ae4427ee9f8 added d + o 11:4ae4427ee9f8 added d | () [default] draft - o 9:917281f93fcb added c + o 10:917281f93fcb added c | () [default] draft - o 8:171614c9a791 added b + o 9:171614c9a791 added b | () [default] draft o 1:c7586e2a9264 added a | () [default] draft @@ -613,7 +613,7 @@ $ echo z > z $ hg ci -Aqm "added z" $ hg glog -r . - @ 22:daf1de08f3b0 added z + @ 26:daf1de08f3b0 added z | () [default] draft ~ @@ -625,26 +625,26 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (daf1de08f3b0) (use 'hg evolve' to update to its successor: 3f7a1f693080) - $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True - rebasing 22:daf1de08f3b0 "added z" - 2 new content-divergent changesets + $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True --config experimental.allowdivergence=True + rebasing 26:daf1de08f3b0 "added z" + 2 new divergent changesets $ echo bar > z $ hg amend $ hg glog - @ 25:53242575ffa9 added z + @ 31:53242575ffa9 added z | () [bar] draft - | o 23:3f7a1f693080 added z + | o 28:3f7a1f693080 added z | | () [default] draft - o | 21:7bbcf24ddecf added y + o | 25:7bbcf24ddecf added y | | () [bar] draft - o | 15:b006cf317e0e added foo to x + o | 17:b006cf317e0e added foo to x | | () [bar] draft - o | 10:4ae4427ee9f8 added d + o | 11:4ae4427ee9f8 added d | | () [default] draft - o | 9:917281f93fcb added c + o | 10:917281f93fcb added c |/ () [default] draft - o 8:171614c9a791 added b + o 9:171614c9a791 added b | () [default] draft o 1:c7586e2a9264 added a | () [default] draft @@ -652,9 +652,9 @@ () [default] draft $ hg evolve --content-divergent - merge:[25] added z - with: [23] added z - base: [22] added z + merge:[31] added z + with: [28] added z + base: [26] added z rebasing "other" content-divergent changeset 3f7a1f693080 on 7bbcf24ddecf merging y warning: conflicts while merging y! (edit, then use 'hg resolve --mark') @@ -683,9 +683,9 @@ continue: hg evolve --continue $ hg evolve --continue - evolving 23:3f7a1f693080 "added z" + evolving 28:3f7a1f693080 "added z" updating to "local" side of the conflict: 53242575ffa9 - merging "other" content-divergent changeset 'cdb0643c69fc' + merging "other" divergent changeset 'cdb0643c69fc' merging y warning: conflicts while merging y! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved @@ -711,17 +711,17 @@ working directory is now at 6fc7d9682de6 $ hg glog - @ 27:6fc7d9682de6 added z + @ 33:6fc7d9682de6 added z | () [bar] draft - o 21:7bbcf24ddecf added y + o 25:7bbcf24ddecf added y | () [bar] draft - o 15:b006cf317e0e added foo to x + o 17:b006cf317e0e added foo to x | () [bar] draft - o 10:4ae4427ee9f8 added d + o 11:4ae4427ee9f8 added d | () [default] draft - o 9:917281f93fcb added c + o 10:917281f93fcb added c | () [default] draft - o 8:171614c9a791 added b + o 9:171614c9a791 added b | () [default] draft o 1:c7586e2a9264 added a | () [default] draft @@ -784,7 +784,6 @@ adding manifests adding file changes added 5 changesets with 5 changes to 5 files - new changesets 8fa14d15e168:c41c793e0ef1 (run 'hg update' to get a working copy) $ hg glog o 4:c41c793e0ef1 added d @@ -802,25 +801,25 @@ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo bar > a $ hg amend -m "watbar to a" - 3 new orphan changesets + 3 new unstable changesets $ echo wat > a $ hg amend -m "watbar to a" $ hg evolve --all move:[2] added b - atop:[6] watbar to a + atop:[8] watbar to a move:[3] added c - atop:[7] added b + atop:[9] added b move:[4] added d - atop:[8] added c + atop:[10] added c working directory is now at 15c781f93cac $ hg glog - @ 9:15c781f93cac added d + @ 11:15c781f93cac added d | () [default] draft - o 8:9e5fb1d5b955 added c + o 10:9e5fb1d5b955 added c | () [default] draft - o 7:88516dccf68a added b + o 9:88516dccf68a added b | () [default] draft - o 6:82b74d5dc678 watbar to a + o 8:82b74d5dc678 watbar to a | () [default] draft o 0:8fa14d15e168 added hgignore () [default] draft @@ -830,23 +829,23 @@ 0 files updated, 0 files merged, 3 files removed, 0 files unresolved $ echo wat > a $ hg amend -m "watbar to a" - 3 new orphan changesets + 3 new unstable changesets $ hg evolve --all move:[2] added b - atop:[5] watbar to a + atop:[6] watbar to a move:[3] added c - atop:[6] added b + atop:[7] added b move:[4] added d - atop:[7] added c + atop:[8] added c working directory is now at c72d2885eb51 $ hg glog - @ 8:c72d2885eb51 added d + @ 9:c72d2885eb51 added d | () [default] draft - o 7:3ce4be6d8e5e added c + o 8:3ce4be6d8e5e added c | () [default] draft - o 6:d5f148423c16 added b + o 7:d5f148423c16 added b | () [default] draft - o 5:8e222f257bbf watbar to a + o 6:8e222f257bbf watbar to a | () [default] draft o 0:8fa14d15e168 added hgignore () [default] draft @@ -858,66 +857,65 @@ adding manifests adding file changes added 4 changesets with 0 changes to 4 files (+1 heads) - 5 new obsolescence markers - new changesets 82b74d5dc678:15c781f93cac + 7 new obsolescence markers (run 'hg heads' to see heads, 'hg merge' to merge) - 8 new content-divergent changesets + 8 new divergent changesets $ hg glog - o 12:15c781f93cac added d + o 13:15c781f93cac added d | () [default] draft - o 11:9e5fb1d5b955 added c + o 12:9e5fb1d5b955 added c | () [default] draft - o 10:88516dccf68a added b + o 11:88516dccf68a added b | () [default] draft - o 9:82b74d5dc678 watbar to a + o 10:82b74d5dc678 watbar to a | () [default] draft - | @ 8:c72d2885eb51 added d + | @ 9:c72d2885eb51 added d | | () [default] draft - | o 7:3ce4be6d8e5e added c + | o 8:3ce4be6d8e5e added c | | () [default] draft - | o 6:d5f148423c16 added b + | o 7:d5f148423c16 added b | | () [default] draft - | o 5:8e222f257bbf watbar to a + | o 6:8e222f257bbf watbar to a |/ () [default] draft o 0:8fa14d15e168 added hgignore () [default] draft $ hg evolve --all --content-divergent - merge:[5] watbar to a - with: [9] watbar to a + merge:[6] watbar to a + with: [10] watbar to a base: [1] added a updating to "local" side of the conflict: 8e222f257bbf - merging "other" content-divergent changeset '82b74d5dc678' + merging "other" divergent changeset '82b74d5dc678' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - merge:[6] added b - with: [10] added b + merge:[7] added b + with: [11] added b base: [2] added b updating to "local" side of the conflict: d5f148423c16 - merging "other" content-divergent changeset '88516dccf68a' + merging "other" divergent changeset '88516dccf68a' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - merge:[7] added c - with: [11] added c + merge:[8] added c + with: [12] added c base: [3] added c updating to "local" side of the conflict: 3ce4be6d8e5e - merging "other" content-divergent changeset '9e5fb1d5b955' + merging "other" divergent changeset '9e5fb1d5b955' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - merge:[8] added d - with: [12] added d + merge:[9] added d + with: [13] added d base: [4] added d updating to "local" side of the conflict: c72d2885eb51 - merging "other" content-divergent changeset '15c781f93cac' + merging "other" divergent changeset '15c781f93cac' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory is now at 038fe7db3d88 $ hg glog - @ 16:038fe7db3d88 added d + @ 17:038fe7db3d88 added d | () [default] draft - o 15:b2cac10f3836 added c + o 16:b2cac10f3836 added c | () [default] draft - o 14:eadfd9d70680 added b + o 15:eadfd9d70680 added b | () [default] draft - o 13:f66f262fff6c watbar to a + o 14:f66f262fff6c watbar to a | () [default] draft o 0:8fa14d15e168 added hgignore () [default] draft