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.
#!/bin/sh
# No local source
hg clone a b
echo $?
# No remote source
hg clone http://127.0.0.1:3121/a b
echo $?
rm -rf b # work around bug with http clone
# Inaccessible source
mkdir a
chmod 000 a
hg clone a b
echo $?
# Inaccessible destination
mkdir b
cd b
hg init
hg clone . ../a
echo $?
cd ..
chmod 700 a
rm -r a b
# Source of wrong type
if "$TESTDIR/hghave" -q fifo; then
mkfifo a
hg clone a b
echo $?
rm a
else
echo "abort: repository a not found!"
echo 255
fi
# Default destination, same directory
mkdir q
cd q
hg init
cd ..
hg clone q
true