1 #!/bin/sh

     2 

     3 # Test issue 746: renaming files brought by the

     4 # second parent of a merge was broken.

     5 

     6 echo % create source repository

     7 hg init t

     8 cd t

     9 echo a > a

    10 hg ci -Am a

    11 cd ..

    12 

    13 echo % fork source repository

    14 hg clone t t2

    15 cd t2

    16 echo b > b

    17 hg ci -Am b

    18 

    19 echo % update source repository

    20 cd ../t

    21 echo a >> a

    22 hg ci -m a2

    23 

    24 echo % merge repositories

    25 hg pull ../t2

    26 hg merge

    27 

    28 echo % rename b as c

    29 hg mv b c

    30 hg st

    31 echo % rename back c as b

    32 hg mv c b

    33 hg st