Mercurial > hg
view tests/test-empty-file.out @ 5096: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 | 9de0e64545a3 |
children | 8feb33c2d153 |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved changeset: 2:62ec0e86d1e5 tag: tip parent: 0:567dde5e6e98 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: add empty3 changeset: 1:41ab7b321727 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: add empty2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) M empty2 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty1 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty2 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty3