tests/test-merge-revert
changeset 2982 890e285c52a1
parent 1933 7544700fd931
child 3988 9dcf9d45cab8
equal deleted inserted replaced
2964:26c8d37496c2 2982:890e285c52a1
    13 hg id
    13 hg id
    14 hg update -C 0
    14 hg update -C 0
    15 hg id
    15 hg id
    16 echo "changed file1" >> file1
    16 echo "changed file1" >> file1
    17 hg id
    17 hg id
    18 hg revert
    18 hg revert --all
    19 hg diff
    19 hg diff
    20 hg status
    20 hg status
    21 hg id
    21 hg id
    22 hg update
    22 hg update
    23 hg diff
    23 hg diff
    27 echo "changed file1" >> file1
    27 echo "changed file1" >> file1
    28 HGMERGE=merge hg update
    28 HGMERGE=merge hg update
    29 hg diff
    29 hg diff
    30 hg status
    30 hg status
    31 hg id
    31 hg id
    32 hg revert
    32 hg revert --all
    33 hg diff
    33 hg diff
    34 hg status
    34 hg status
    35 hg id
    35 hg id
    36 hg revert -r tip
    36 hg revert -r tip --all
    37 hg diff
    37 hg diff
    38 hg status
    38 hg status
    39 hg id
    39 hg id
    40 hg update -C
    40 hg update -C
    41 hg diff
    41 hg diff