Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-update-reverse.out @ 5149:ad6b97132b81
merge: fix a copy detection bug (issue672)
When merging rev1 and rev2, we want to search for copies that happened
in rev1 but not in rev2 and vice-versa. We were starting the search at
rev1/rev2 and then going back, stopping as soon as we reached the revno
of the ancestor, but that can miss some cases (see the new
test-issue672).
Now we calculate the revisions that are ancestors of rev1 or rev2 (but
not both) and make sure the search doesn't stop too early.
Simplified test provided by mpm, based on a test case provided by
Edward Lee.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Sun, 12 Aug 2007 12:15:10 -0300 |
| parents | b16456909a0a |
| children |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved Main should be gone a changeset: 3:ded32b0db104 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Added side2 changeset: 2:92a816cea698 parent: 0:537353581d3d user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Added side1 changeset: 1:221226fb2bd8 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Added main changeset: 0:537353581d3d user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Added a Should have two heads, side2 and main changeset: 3:ded32b0db104 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Added side2 changeset: 1:221226fb2bd8 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Added main Should show a side1 side2 a side1 side2 resolving manifests overwrite True partial False ancestor 537353581d3d local ded32b0db104+ remote 221226fb2bd8 side2: remote deleted -> r side1: remote deleted -> r main: remote created -> g getting main removing side1 removing side2 1 files updated, 0 files merged, 2 files removed, 0 files unresolved Should only show a main a main