tests/test-merge-revert2
changeset 1933 7544700fd931
parent 981 4f81068ed8cd
child 2029 d436b21b20dc
equal deleted inserted replaced
1932:82995896d5af 1933:7544700fd931
     5 hg init
     5 hg init
     6 echo "added file1" > file1
     6 echo "added file1" > file1
     7 echo "another line of text" >> file1
     7 echo "another line of text" >> file1
     8 echo "added file2" > file2
     8 echo "added file2" > file2
     9 hg add file1 file2
     9 hg add file1 file2
    10 hg commit -m "added file1 and file2" -d "0 0" -u user
    10 hg commit -m "added file1 and file2" -d "1000000 0" -u user
    11 echo "changed file1" >> file1
    11 echo "changed file1" >> file1
    12 hg commit -m "changed file1" -d "0 0" -u user
    12 hg commit -m "changed file1" -d "1000000 0" -u user
    13 hg -q log
    13 hg -q log
    14 hg id
    14 hg id
    15 hg update -C 0
    15 hg update -C 0
    16 hg id
    16 hg id
    17 echo "changed file1" >> file1
    17 echo "changed file1" >> file1