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
echo '% Show all commands except debug commands'
hg debugcomplete
echo
echo '% Show all commands that start with "a"'
hg debugcomplete a
echo
echo '% Do not show debug commands if there are other candidates'
hg debugcomplete d
echo
echo '% Show debug commands if there are no other candidates'
hg debugcomplete debug
echo
echo '% Do not show the alias of a debug command if there are other candidates'
echo '% (this should hide rawcommit)'
hg debugcomplete r
echo
echo '% Show the alias of a debug command if there are no other candidates'
hg debugcomplete rawc
echo
echo '% Show the global options'
hg debugcomplete --options | sort
echo
echo '% Show the options for the "serve" command'
hg debugcomplete --options serve | sort
echo
echo '% Show an error if we use --options with an ambiguous abbreviation'
hg debugcomplete --options s
exit 0