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
hg init a
cd a
echo a > a
hg ci -A -d'1 0' -m a
cd ..
hg init b
cd b
echo b > b
hg ci -A -d'1 0' -m b
cd ..
hg clone a c
cd c
hg pull -f ../b
hg merge
cd ..
echo %% -R/--repository
hg -R a tip
hg --repository b tip
echo %% abbrev of long option
hg --repo c tip
echo "%% earlygetopt with duplicate options (36d23de02da1)"
hg --cwd a --cwd b --cwd c tip
hg --repo c --repository b -R a tip
echo "%% earlygetopt short option without following space"
hg -q -Rb tip
echo "%% earlygetopt with illegal abbreviations"
hg --confi "foo.bar=baz"
hg --cw a tip
hg --rep a tip
hg --repositor a tip
hg -qR a tip
hg -qRa tip
echo %% --cwd
hg --cwd a parents
echo %% -y/--noninteractive - just be sure it is parsed
hg --cwd a tip -q --noninteractive
hg --cwd a tip -q -y
echo %% -q/--quiet
hg -R a -q tip
hg -R b -q tip
hg -R c --quiet parents
echo %% -v/--verbose
hg --cwd c head -v
hg --cwd b tip --verbose
echo %% --config
hg --cwd c --config paths.quuxfoo=bar paths | grep quuxfoo > /dev/null && echo quuxfoo
hg --cwd c --config '' tip -q
hg --cwd c --config a.b tip -q
hg --cwd c --config a tip -q
hg --cwd c --config a.= tip -q
hg --cwd c --config .b= tip -q
echo %% --debug
hg --cwd c log --debug
echo %% --traceback
hg --cwd c --config x --traceback tip 2>&1 | grep -i 'traceback'
echo %% --time
hg --cwd a --time tip 2>&1 | grep '^Time:' | sed 's/[0-9][0-9]*/x/g'
echo %% --version
hg --version -q | sed 's/version [^)]*/version xxx/'
echo %% -h/--help
hg -h
hg --help
echo %% not tested: --debugger