merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
#!/bin/sh
hg init
mkdir alpha
touch alpha/one
mkdir beta
touch beta/two
hg add alpha/one beta/two
hg ci -m "start" -d "1000000 0"
echo 1 > alpha/one
echo 2 > beta/two
echo EVERYTHING
hg diff --nodates
echo BETA ONLY
hg diff --nodates beta
echo INSIDE BETA
cd beta
hg diff --nodates .