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

set -e

mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit -m "1"
hg verify

hg clone . ../branch
cd ../branch
hg co
echo bar>>foo
hg commit -m "2"

cd ../test
hg pull ../branch
hg verify
hg co
cat foo
hg manifest