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.
adding a
adding b
adding dir.h/foo
adding t.h
adding t/b
adding t/e.h
adding t/x
hg locate a
a
locate succeeded
hg locate NONEXISTENT
locate failed
hg locate
a
b
dir.h/foo
t.h
t/b
t/e.h
t/x
hg locate a
hg locate NONEXISTENT
hg locate relpath:NONEXISTENT
hg locate
b
dir.h/foo
t.h
t/b
t/e.h
t/x
hg locate -r 0 a
a
hg locate -r 0 NONEXISTENT
hg locate -r 0 relpath:NONEXISTENT
hg locate -r 0
a
b
dir.h/foo
t.h
t/b
t/e.h
t/x
% -I/-X with relative path should work
hg locate
b
dir.h/foo
t.h
t/b
t/e.h
t/x
hg locate -I ../t
t/b
t/e.h
t/x
hg locate t/**
t/b
t/e.h
t/x
hg locate b
../b
../t/b
hg locate *.h
../t.h
../t/e.h
hg locate path:t/x
../t/x
hg locate re:.*\.h$
../t.h
../t/e.h
hg locate -r 0 b
../b
../t/b
hg locate -r 0 *.h
../t.h
../t/e.h
hg locate -r 0 path:t/x
../t/x
hg locate -r 0 re:.*\.h$
../t.h
../t/e.h