tests/test-merge-revert
changeset 1933 7544700fd931
parent 839 9c918287d10b
child 2965 890e285c52a1
equal deleted inserted replaced
1932:82995896d5af 1933:7544700fd931
     4 cd t
     4 cd t
     5 hg init
     5 hg init
     6 echo "added file1" > file1
     6 echo "added file1" > file1
     7 echo "added file2" > file2
     7 echo "added file2" > file2
     8 hg add file1 file2
     8 hg add file1 file2
     9 hg commit -m "added file1 and file2" -d "0 0" -u user
     9 hg commit -m "added file1 and file2" -d "1000000 0" -u user
    10 echo "changed file1" >> file1
    10 echo "changed file1" >> file1
    11 hg commit -m "changed file1" -d "0 0" -u user
    11 hg commit -m "changed file1" -d "1000000 0" -u user
    12 hg -q log
    12 hg -q log
    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