1 #!/bin/sh

     2 

     3 # test that we don't interrupt the merge session if

     4 # a file-level merge failed

     5 

     6 hg init repo

     7 cd repo

     8 

     9 echo foo > foo

    10 echo a > bar

    11 hg ci -Am 'add foo'

    12 

    13 hg mv foo baz

    14 echo b >> bar

    15 echo quux > quux1

    16 hg ci -Am 'mv foo baz'

    17 

    18 hg up -qC 0

    19 echo >> foo

    20 echo c >> bar

    21 echo quux > quux2

    22 hg ci -Am 'change foo'

    23 

    24 # test with the rename on the remote side

    25 HGMERGE=false hg merge

    26 hg resolve -l

    27 

    28 # test with the rename on the local side

    29 hg up -C 1

    30 HGMERGE=false hg merge

    31 

    32 echo % show unresolved

    33 hg resolve -l

    34 

    35 echo % unmark baz

    36 hg resolve -u baz

    37 

    38 echo % show

    39 hg resolve -l

    40 hg st

    41 

    42 echo % re-resolve baz

    43 hg resolve baz

    44 

    45 echo % after

    46 hg resolve -l

    47 

    48 echo % resolve all warning

    49 hg resolve

    50 

    51 echo % resolve all

    52 hg resolve -a

    53 

    54 echo % after

    55 hg resolve -l

    56 

    57 true