Mercurial > evolve
comparison tests/test-evolve-issue5958.t @ 5474:86c6c7951f74
evolve: fix content-div resolution when in parent-child form
case:
"two divergent csets where one is the parent of other"
cset_b (content-divergent)
|
cset_a (content-divergent)
|
~
Before this patch, we were not correctly handling the case when both the
divergent cset are in parent-child form. And its resolution was going
through the logic which solves other variants of content-divergence.
Resolution (after this patch):
merge is performed between the two and parent (or parent's successor,
if apply) of lower one is treated as resolution parent.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Sun, 26 Jul 2020 01:02:22 +0530 |
| parents | b8bcf7562ea1 |
| children | 21956b2a16eb |
comparison
equal
deleted
inserted
replaced
| 5473:b8bcf7562ea1 | 5474:86c6c7951f74 |
|---|---|
| 84 |/ date-changed(date) from cc71ffbc7c00 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) | 84 |/ date-changed(date) from cc71ffbc7c00 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
| 85 | | 85 | |
| 86 x cc71ffbc7c00 (1) add foo.txt | 86 x cc71ffbc7c00 (1) add foo.txt |
| 87 | 87 |
| 88 $ hg evolve --content-divergent | 88 $ hg evolve --content-divergent |
| 89 merge:[6] add foo.txt | 89 merge:[4] add foo.txt |
| 90 with: [4] add foo.txt | 90 with: [6] add foo.txt |
| 91 base: [1] add foo.txt | 91 base: [1] add foo.txt |
| 92 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 92 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 93 1 new orphan changesets | 93 working directory is now at 17e66b2fbf1b |
| 94 working directory is now at 5899f25049de | |
| 95 | 94 |
| 96 $ hg log -G | 95 $ hg log -G |
| 97 @ changeset: 7:5899f25049de | 96 @ changeset: 7:17e66b2fbf1b |
| 98 | tag: tip | 97 | tag: tip |
| 99 | parent: 4:c17bf400a278 | 98 | parent: 0:a24ed8ad918c |
| 100 | user: test | 99 | user: test |
| 101 | date: Wed Dec 31 23:59:58 1969 -0000 | 100 | date: Wed Dec 31 23:59:58 1969 -0000 |
| 102 | instability: orphan | |
| 103 | summary: add foo.txt | |
| 104 | | |
| 105 x changeset: 4:c17bf400a278 | |
| 106 | parent: 0:a24ed8ad918c | |
| 107 | user: test | |
| 108 | date: Wed Dec 31 23:59:59 1969 -0000 | |
| 109 | obsolete: rewritten using evolve as 7:5899f25049de | |
| 110 | summary: add foo.txt | 101 | summary: add foo.txt |
| 111 | | 102 | |
| 112 o changeset: 0:a24ed8ad918c | 103 o changeset: 0:a24ed8ad918c |
| 113 user: test | 104 user: test |
| 114 date: Thu Jan 01 00:00:00 1970 +0000 | 105 date: Thu Jan 01 00:00:00 1970 +0000 |