Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-rename-merge1.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 | f191bc3916f7 |
| children | 17ed9b9a0d03 |
line wrap: on
line source
checkout 2 files updated, 0 files merged, 2 files removed, 0 files unresolved merge resolving manifests overwrite None partial False ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2 a2: divergent renames -> dr a: remote moved to b -> m b2: remote created -> g copying a to b merging a and b my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c removing a warning: detected divergent renames of a2 to: c2 b2 getting b2 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) M b a M b2 R a C c2 blahblah rev offset length base linkrev nodeid p1 p2 0 0 67 0 1 dc51707dfc98 000000000000 000000000000 1 67 72 1 3 b2494a44f0a9 000000000000 dc51707dfc98 b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66