Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-issue672.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 | |
| children | 17ed9b9a0d03 |
comparison
equal
deleted
inserted
replaced
| 5147:f3f033def181 | 5149:ad6b97132b81 |
|---|---|
| 1 adding 1 | |
| 2 adding 2 | |
| 3 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 4 resolving manifests | |
| 5 overwrite None partial False | |
| 6 ancestor 81f4b099af3d local c64f439569a9+ remote 2f8037f47a5c | |
| 7 1: other deleted -> r | |
| 8 1a: remote created -> g | |
| 9 removing 1 | |
| 10 getting 1a | |
| 11 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 12 (branch merge, don't forget to commit) | |
| 13 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 14 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 15 resolving manifests | |
| 16 overwrite None partial False | |
| 17 ancestor c64f439569a9 local ac7575e3c052+ remote 746e9549ea96 | |
| 18 1a: local moved to 1 -> m | |
| 19 merging 1a and 1 | |
| 20 my 1a@ac7575e3c052+ other 1@746e9549ea96 ancestor 1@81f4b099af3d | |
| 21 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 22 (branch merge, don't forget to commit) | |
| 23 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 24 resolving manifests | |
| 25 overwrite None partial False | |
| 26 ancestor c64f439569a9 local 746e9549ea96+ remote ac7575e3c052 | |
| 27 1: remote moved to 1a -> m | |
| 28 copying 1 to 1a | |
| 29 merging 1 and 1a | |
| 30 my 1@746e9549ea96+ other 1a@2f8037f47a5c ancestor 1@81f4b099af3d | |
| 31 removing 1 | |
| 32 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 33 (branch merge, don't forget to commit) |