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

mkdir t

     4

cd t

     5

hg init

     6

echo a > a

     7

hg add a

     8

hg commit -m "test" -d "1000000 0"

     9

hg verify

    10

hg parents

    11

hg status

    12

hg rollback

    13

hg verify

    14

hg parents

    15

hg status