1 #!/bin/sh

     2 # a test for issue586

     3 

     4 hg init a

     5 cd a

     6 echo a > a

     7 hg ci -Ama

     8 

     9 hg init ../b

    10 cd ../b

    11 echo b > b

    12 hg ci -Amb

    13 

    14 hg pull -f ../a

    15 hg merge

    16 hg rm -f a

    17 hg ci -Amc

    18 

    19 hg st -A