diff -r 142827ad86f3 -r a73cdef2e33f tests/test-evolve-content-divergent-stack.t --- a/tests/test-evolve-content-divergent-stack.t Thu May 07 07:57:14 2020 -0700 +++ b/tests/test-evolve-content-divergent-stack.t Fri May 08 04:02:22 2020 +0200 @@ -148,28 +148,28 @@ merge:[6] added b with: [10] added b base: [2] added b - rebasing "divergent" content-divergent changeset d5f148423c16 on f9ec70805963 + rebasing "divergent" content-divergent changeset d5f148423c16 on df93a529fa42 0 files updated, 0 files merged, 0 files removed, 0 files unresolved merge:[7] added c with: [11] added c base: [3] added c - rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on fa0055a90894 + rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on 365f419742a3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved merge:[8] added d with: [12] added d base: [4] added d - rebasing "divergent" content-divergent changeset c72d2885eb51 on 0b6449a7ad07 + rebasing "divergent" content-divergent changeset c72d2885eb51 on a18171c7d9e7 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at f9ec70805963 + working directory is now at df93a529fa42 $ hg glog - o 19:2b48850357ee added d + o 19:59d49942cf47 added d | () [default] draft - o 17:0b6449a7ad07 added c + o 17:a18171c7d9e7 added c | () [default] draft - o 15:fa0055a90894 added b + o 15:365f419742a3 added b | () [default] draft - @ 13:f9ec70805963 watbar to a + @ 13:df93a529fa42 watbar to a | () [default] draft o 0:8fa14d15e168 added hgignore () [default] draft @@ -319,31 +319,31 @@ merge:[11] added b with: [6] added b base: [2] added b - rebasing "divergent" content-divergent changeset 6eb54b5af3fb on c68b60ab6619 - rebasing "other" content-divergent changeset d5f148423c16 on c68b60ab6619 + rebasing "divergent" content-divergent changeset 6eb54b5af3fb on ebb749d2ace8 + rebasing "other" content-divergent changeset d5f148423c16 on ebb749d2ace8 0 files updated, 0 files merged, 0 files removed, 0 files unresolved merge:[12] added c with: [7] added c base: [3] added c - rebasing "divergent" content-divergent changeset 8ed612937375 on ff90e9515d17 - rebasing "other" content-divergent changeset 3ce4be6d8e5e on ff90e9515d17 + rebasing "divergent" content-divergent changeset 8ed612937375 on 9437917ebe8d + rebasing "other" content-divergent changeset 3ce4be6d8e5e on 9437917ebe8d 0 files updated, 0 files merged, 0 files removed, 0 files unresolved merge:[13] added d with: [8] added d base: [4] added d - rebasing "divergent" content-divergent changeset d45f050514c2 on 4270af019ebe - rebasing "other" content-divergent changeset c72d2885eb51 on 4270af019ebe + rebasing "divergent" content-divergent changeset d45f050514c2 on 8e574c12775a + rebasing "other" content-divergent changeset c72d2885eb51 on 8e574c12775a 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at c68b60ab6619 + working directory is now at ebb749d2ace8 $ hg glog - o 24:78efb5c9d581 added d + o 24:5ab9b88fbead added d | () [default] draft - o 21:4270af019ebe added c + o 21:8e574c12775a added c | () [default] draft - o 18:ff90e9515d17 added b + o 18:9437917ebe8d added b | () [default] draft - @ 15:c68b60ab6619 watbar to a + @ 15:ebb749d2ace8 watbar to a | () [default] draft o 9:2228e3b74514 add newfile | () [default] draft @@ -355,7 +355,7 @@ $ hg strip 14: --hidden 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/c68b60ab6619-a957686d-backup.hg + saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/ebb749d2ace8-0585ef5a-backup.hg 8 new content-divergent changesets Prepare repo to have merge conflicts @@ -368,7 +368,7 @@ rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 6 new orphan changesets - working directory is now at c68b60ab6619 + working directory is now at ebb749d2ace8 $ echo b_conflict > b $ hg amend -A adding b @@ -378,7 +378,7 @@ merge:[11] added b with: [6] added b base: [2] added b - rebasing "divergent" content-divergent changeset 6eb54b5af3fb on 1a1d3f0cfe5a + rebasing "divergent" content-divergent changeset 6eb54b5af3fb on 73a960350ce9 merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -391,7 +391,7 @@ continue: hg evolve --continue $ hg evolve --continue evolving 11:6eb54b5af3fb "added b" - rebasing "other" content-divergent changeset d5f148423c16 on 1a1d3f0cfe5a + rebasing "other" content-divergent changeset d5f148423c16 on 73a960350ce9 merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts @@ -408,24 +408,24 @@ merge:[12] added c with: [7] added c base: [3] added c - rebasing "divergent" content-divergent changeset 8ed612937375 on 58f146beb59b - rebasing "other" content-divergent changeset 3ce4be6d8e5e on 58f146beb59b + rebasing "divergent" content-divergent changeset 8ed612937375 on 1b637ec00f24 + rebasing "other" content-divergent changeset 3ce4be6d8e5e on 1b637ec00f24 0 files updated, 0 files merged, 0 files removed, 0 files unresolved merge:[13] added d with: [8] added d base: [4] added d - rebasing "divergent" content-divergent changeset d45f050514c2 on 6f6ca0d5d239 - rebasing "other" content-divergent changeset c72d2885eb51 on 6f6ca0d5d239 + rebasing "divergent" content-divergent changeset d45f050514c2 on fbfadbe143d8 + rebasing "other" content-divergent changeset c72d2885eb51 on fbfadbe143d8 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at 1a1d3f0cfe5a + working directory is now at 73a960350ce9 $ hg glog - o 25:b8c8157a53cd added d + o 25:bf2836f524a3 added d | () [default] draft - o 22:6f6ca0d5d239 added c + o 22:fbfadbe143d8 added c | () [default] draft - o 19:58f146beb59b added b + o 19:1b637ec00f24 added b | () [default] draft - @ 16:1a1d3f0cfe5a watbar to a + @ 16:73a960350ce9 watbar to a | () [default] draft o 9:2228e3b74514 add newfile | () [default] draft @@ -436,7 +436,7 @@ -------------------------------------------------------------- $ hg strip 14: --hidden 0 files updated, 0 files merged, 2 files removed, 0 files unresolved - saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/c68b60ab6619-3384c553-backup.hg + saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/ebb749d2ace8-c2c1e937-backup.hg 8 new content-divergent changesets Insert conflicting changes in between the stack of content-div csets @@ -477,8 +477,8 @@ merge:[14] added b with: [17] added b base: [2] added b - rebasing "divergent" content-divergent changeset 2a955e808c53 on c68b60ab6619 - rebasing "other" content-divergent changeset 509103439e5e on c68b60ab6619 + rebasing "divergent" content-divergent changeset 2a955e808c53 on ebb749d2ace8 + rebasing "other" content-divergent changeset 509103439e5e on ebb749d2ace8 merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved @@ -578,8 +578,8 @@ merge:[14] added b with: [17] added b base: [2] added b - rebasing "divergent" content-divergent changeset 2a955e808c53 on c68b60ab6619 - rebasing "other" content-divergent changeset 509103439e5e on c68b60ab6619 + rebasing "divergent" content-divergent changeset 2a955e808c53 on ebb749d2ace8 + rebasing "other" content-divergent changeset 509103439e5e on ebb749d2ace8 merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved @@ -593,7 +593,7 @@ stopped the interrupted evolve working directory is now at 2a955e808c53 $ hg log -G - o changeset: 21:c68b60ab6619 + o changeset: 21:ebb749d2ace8 | tag: tip | parent: 9:2228e3b74514 | user: test @@ -641,7 +641,7 @@ +---x changeset: 10:c04ff147ef79 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | obsolete: rewritten using evolve as 21:c68b60ab6619 + | | obsolete: rewritten using evolve as 21:ebb749d2ace8 | | summary: added a | | o | changeset: 9:2228e3b74514 @@ -654,7 +654,7 @@ |/ parent: 0:8fa14d15e168 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rebased using evolve as 21:c68b60ab6619 + | obsolete: rebased using evolve as 21:ebb749d2ace8 | summary: watbar to a | o changeset: 0:8fa14d15e168 @@ -663,13 +663,13 @@ summary: added hgignore $ hg obslog -r 'desc("watbar to a")' --all - o c68b60ab6619 (21) watbar to a + o ebb749d2ace8 (21) watbar to a |\ x | 186bdc2cdfa2 (20) watbar to a - | | rewritten as c68b60ab6619 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | rewritten as ebb749d2ace8 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | | | x c04ff147ef79 (10) added a - | | rewritten(description, content) as c68b60ab6619 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | rewritten(description, content) as ebb749d2ace8 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | | x | 8e222f257bbf (5) watbar to a |/ rebased(parent) as 186bdc2cdfa2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) @@ -699,8 +699,8 @@ merge:[14] added b with: [17] added b base: [2] added b - rebasing "divergent" content-divergent changeset 2a955e808c53 on c68b60ab6619 - rebasing "other" content-divergent changeset 509103439e5e on c68b60ab6619 + rebasing "divergent" content-divergent changeset 2a955e808c53 on ebb749d2ace8 + rebasing "other" content-divergent changeset 509103439e5e on ebb749d2ace8 merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved @@ -716,16 +716,16 @@ merge:[15] added c with: [18] added c base: [3] added c - rebasing "divergent" content-divergent changeset 48b0f803817a on f51f02e0d589 - rebasing "other" content-divergent changeset eaf34afe4df3 on f51f02e0d589 + rebasing "divergent" content-divergent changeset 48b0f803817a on 32bceb5bc91e + rebasing "other" content-divergent changeset eaf34afe4df3 on 32bceb5bc91e 0 files updated, 0 files merged, 0 files removed, 0 files unresolved merge:[16] added d with: [19] added d base: [4] added d - rebasing "divergent" content-divergent changeset 91c8ccb9c241 on f0edb9305414 - rebasing "other" content-divergent changeset c351be27f199 on f0edb9305414 + rebasing "divergent" content-divergent changeset 91c8ccb9c241 on a87eb9f90df6 + rebasing "other" content-divergent changeset c351be27f199 on a87eb9f90df6 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at f51f02e0d589 + working directory is now at 32bceb5bc91e $ hg evolve -l @@ -860,8 +860,8 @@ merge:[7] c with: [4] c base: [2] c - rebasing "divergent" content-divergent changeset ef4885dea3da on 744161d6411b - rebasing "other" content-divergent changeset fef59171875e on 744161d6411b + rebasing "divergent" content-divergent changeset ef4885dea3da on 6813d99f0a9d + rebasing "other" content-divergent changeset fef59171875e on 6813d99f0a9d 0 files updated, 0 files merged, 0 files removed, 0 files unresolved Expected result: @@ -869,15 +869,15 @@ Changeset with description "c" only adds file "c" with content "c". $ hg glog -l2 -p - o 12:4f07c2bae326 c - | () [default] draftdiff -r 744161d6411b -r 4f07c2bae326 c + o 12:d5a8159e883f c + | () [default] draftdiff -r 6813d99f0a9d -r d5a8159e883f c | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 | @@ -0,0 +1,1 @@ | +c | - o 9:744161d6411b b - | () [default] draftdiff -r 980f7dc84c29 -r 744161d6411b b + o 9:6813d99f0a9d b + | () [default] draftdiff -r 980f7dc84c29 -r 6813d99f0a9d b ~ --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/b Thu Jan 01 00:00:00 1970 +0000 @@ -0,0 +1,1 @@ @@ -963,16 +963,16 @@ merge:[9] added bar and car with: [5] added bar and car base: [2] added bar and car - rebasing "divergent" content-divergent changeset 7dd5b9d42ef3 on 79e1386ae402 - rebasing "other" content-divergent changeset f4ed107810a7 on 79e1386ae402 + rebasing "divergent" content-divergent changeset 7dd5b9d42ef3 on 586526ab82c5 + rebasing "other" content-divergent changeset f4ed107810a7 on 586526ab82c5 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 new orphan changesets - working directory is now at 79e1386ae402 + working directory is now at 586526ab82c5 $ hg glog - o 15:f0a0eeecf543 added bar and car + o 15:e905bb19fd7e added bar and car | () [default] draft - @ 12:79e1386ae402 added foo + @ 12:586526ab82c5 added foo | () [default] draft | * 10:9a1f460df8b5 added dar | | () [default] draft