tests/test-merge-remove.t
changeset 47989 87b3010c08e0
parent 46418 dc00324e80f4
child 49621 55c6ebd11cb9
equal deleted inserted replaced
47988:d459c6b84961 47989:87b3010c08e0
    53   $ hg add -v foo1 bar
    53   $ hg add -v foo1 bar
    54   adding bar
    54   adding bar
    55   adding foo1
    55   adding foo1
    56 
    56 
    57   $ hg debugstate --no-dates
    57   $ hg debugstate --no-dates
    58   n   0         -2 unset               bar
    58   m   0         -2 unset               bar
    59   n   0         -2 unset               foo1
    59   m   0         -2 unset               foo1
    60   copy: foo -> foo1
    60   copy: foo -> foo1
    61 
    61 
    62   $ hg st -qC
    62   $ hg st -qC
    63   M bar
    63   M bar
    64   M foo1
    64   M foo1
    72   saving current version of foo1 as foo1.orig
    72   saving current version of foo1 as foo1.orig
    73   reverting bar
    73   reverting bar
    74   reverting foo1
    74   reverting foo1
    75 
    75 
    76   $ hg debugstate --no-dates
    76   $ hg debugstate --no-dates
    77   n   0         -2 unset               bar
    77   m   0         -2 unset               bar
    78   n   0         -2 unset               foo1
    78   m   0         -2 unset               foo1
    79   copy: foo -> foo1
    79   copy: foo -> foo1
    80 
    80 
    81   $ hg st -qC
    81   $ hg st -qC
    82   M bar
    82   M bar
    83   M foo1
    83   M foo1