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

touch unknown

     5

     6

touch a

     7

hg add a

     8

hg ci -m "1" -d "1000000 0"

     9

    10

touch b

    11

hg add b

    12

hg ci -m "2" -d "1000000 0"

    13

    14

echo %% Should show unknown

    15

hg status

    16

hg revert -r 0 --all

    17

echo %% Should show unknown and b removed

    18

hg status

    19

echo %% Should show a and unknown

    20

ls