Mercurial > hg
view tests/test-locate @ 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 | a5cde03cd019 |
children | 4c94b6d0fb1c |
line wrap: on
line source
#!/bin/sh hglocate() { echo "hg locate $@" hg locate "$@" ret=$? echo return $ret } mkdir t cd t hg init echo 0 > a echo 0 > b echo 0 > t.h mkdir t echo 0 > t/x echo 0 > t/b echo 0 > t/e.h mkdir dir.h echo 0 > dir.h/foo hg ci -A -m m -d "1000000 0" touch nottracked hglocate a && echo locate succeeded || echo locate failed hglocate NONEXISTENT && echo locate succeeded || echo locate failed hglocate hg rm a hg ci -m m -d "1000000 0" hglocate a hglocate NONEXISTENT hglocate relpath:NONEXISTENT hglocate hglocate -r 0 a hglocate -r 0 NONEXISTENT hglocate -r 0 relpath:NONEXISTENT hglocate -r 0 echo % -I/-X with relative path should work cd t hglocate hglocate -I ../t # test issue294 cd .. rm -r t hglocate 't/**' mkdir otherdir cd otherdir hglocate b hglocate '*.h' hglocate path:t/x hglocate 're:.*\.h$' hglocate -r 0 b hglocate -r 0 '*.h' hglocate -r 0 path:t/x hglocate -r 0 're:.*\.h$'