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

     5

mkdir alpha

     6

touch alpha/one

     7

mkdir beta

     8

touch beta/two

     9

    10

hg add alpha/one beta/two

    11

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

    12

    13

echo 1 > alpha/one

    14

echo 2 > beta/two

    15

    16

echo EVERYTHING

    17

hg diff --nodates

    18

    19

echo BETA ONLY

    20

hg diff --nodates beta

    21

    22

echo INSIDE BETA

    23

cd beta

    24

hg diff --nodates .