1 #!/bin/sh

     2 

     3 hg init a

     4 cd a

     5 echo a > a

     6 hg add -n

     7 hg st

     8 hg add

     9 hg st

    10 

    11 echo b > b

    12 hg add -n b

    13 hg st

    14 hg add b

    15 hg st

    16 echo % should fail

    17 hg add b

    18 hg st

    19 

    20 hg ci -m 0

    21 echo % should fail

    22 hg add a

    23 

    24 echo aa > a

    25 hg ci -m 1

    26 hg up 0

    27 echo aaa > a

    28 hg ci -m 2

    29 

    30 hg merge

    31 hg st

    32 echo % should fail

    33 hg add a

    34 hg st

    35 hg ci -m merge

    36 

    37 echo % issue683

    38 hg rm a

    39 hg st

    40 echo a > a

    41 hg add a

    42 hg st