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

     1

#!/bin/sh

     2

     3

hg init

     4

python -c 'print "confuse str.splitlines\nembedded\rnewline"' > a

     5

hg ci -Ama -d '1 0'

     6

echo clean diff >> a

     7

hg ci -mb -d '2 0'

     8

hg diff -r0 -r1