merge: do early copy to deal with issue636
Without copies/renames, merges source names are 1:1 with their
targets. Copies and renames introduce the possibility that there will
be two merges with the same input but different output. By doing the
copy to the destination name before the merge, the actual merge
becomes 1:1 again, and no source is the input to two different merges.
- add a preliminary scan to applyupdates to do copies
- for the merge action, pass the old name (for finding ancestors) and
the new name (for input to the merge) to filemerge
- eliminate the old post-merge copy
- lookup file contents from new name in filemerge
- pass new name to external merge helper
- report merge failure at new name
- add a test
#!/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