Mercurial > hg
view tests/test-archive.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 | a49f2a4d5ff7 |
children | 0f594cc36aed b8009718a211 b70a530bdb93 |
line wrap: on
line source
adding foo adding bar adding baz/bletch test-archive-TIP/.hg_archival.txt test-archive-TIP/bar test-archive-TIP/baz/bletch test-archive-TIP/foo test-archive-TIP/.hg_archival.txt test-archive-TIP/bar test-archive-TIP/baz/bletch test-archive-TIP/foo Archive: archive.zip testing: test-archive-TIP/.hg_archival.txt OK testing: test-archive-TIP/bar OK testing: test-archive-TIP/baz/bletch OK testing: test-archive-TIP/foo OK No errors detected in compressed data of archive.zip. test/.hg_archival.txt test/bar test/baz/bletch test/foo test/.hg_archival.txt test/bar test/foo test-TIP/.hg_archival.txt test-TIP/bar test-TIP/baz/bletch test-TIP/foo True abort: archive prefix contains illegal components Archive: test.zip testing: test/.hg_archival.txt OK testing: test/bar OK testing: test/baz/bletch OK testing: test/foo OK No errors detected in compressed data of test.zip. test-TIP/.hg_archival.txt test-TIP/bar test-TIP/baz/bletch test-TIP/foo rev-0.tar created % empty repo abort: repository has no revisions