Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-git-import.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 | 826659bd8053 |
| children | 477136fa6571 |
line wrap: on
line source
% new file applying patch from stdin % new empty file applying patch from stdin empty % chmod +x applying patch from stdin % copy applying patch from stdin a a % rename applying patch from stdin copyx empty new rename % delete applying patch from stdin empty new rename % regular diff applying patch from stdin % copy and modify applying patch from stdin a a b a a % rename and modify applying patch from stdin a a b c a % one file renamed multiple times applying patch from stdin 9 rename2 rename3 rename3-2 / rename3 (rename2)rename3-2 (rename2) rename3 rename3-2 a a b c a a a b c a % binary files and regular patch hunks applying patch from stdin foo 045c85ba38952325e126c70962cc0f9d9077bc67 644 binary % many binary files applying patch from stdin 045c85ba38952325e126c70962cc0f9d9077bc67 644 mbinary1 a874b471193996e7cb034bb301cac7bdaf3e3f46 644 mbinary2 % filenames with spaces applying patch from stdin foo