tests/test-merge-revert2
changeset 12156 4c94b6d0fb1c
parent 4387 93a4e72b4f83
equal deleted inserted replaced
12155:94ad12aa0530 12156:4c94b6d0fb1c
     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 "1000000 0" -u user
    10 hg commit -m "added file1 and file2"
    11 echo "changed file1" >> file1
    11 echo "changed file1" >> file1
    12 hg commit -m "changed file1" -d "1000000 0" -u user
    12 hg commit -m "changed file1"
    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