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
"$TESTDIR/hghave" symlink || exit 80
cleanpath()
{
sed -e "s:/.*\(/test-symlink-basic/.*\):...\1:"
}
cat >> readlink.py <<EOF
import os
import sys
for f in sys.argv[1:]:
print f, '->', os.readlink(f)
EOF
hg init a
cd a
ln -s nothing dangling
hg commit -m 'commit symlink without adding' -d '0 0' dangling 2>&1 | cleanpath
hg add dangling
hg commit -m 'add symlink' -d '0 0'
hg tip -v
hg manifest --debug
echo '% rev 0:'
python ../readlink.py dangling
rm dangling
ln -s void dangling
hg commit -m 'change symlink'
echo '% rev 1:'
python ../readlink.py dangling
echo '% modifying link'
rm dangling
ln -s empty dangling
python ../readlink.py dangling
echo '% reverting to rev 0:'
hg revert -r 0 -a
python ../readlink.py dangling
echo '% backups:'
python ../readlink.py *.orig
rm *.orig
hg up -C
echo '% copies'
hg cp -v dangling dangling2
hg st -Cmard
python ../readlink.py dangling dangling2