tests/test-merge4
changeset 1933 7544700fd931
parent 814 0902ffece4b4
child 2283 e506c14382fd
equal deleted inserted replaced
1932:82995896d5af 1933:7544700fd931
     1 #!/bin/sh
     1 #!/bin/sh
     2 
     2 
     3 hg init
     3 hg init
     4 echo This is file a1 > a
     4 echo This is file a1 > a
     5 hg add a
     5 hg add a
     6 hg commit -m "commit #0" -d "0 0"
     6 hg commit -m "commit #0" -d "1000000 0"
     7 echo This is file b1 > b
     7 echo This is file b1 > b
     8 hg add b
     8 hg add b
     9 hg commit -m "commit #1" -d "0 0"
     9 hg commit -m "commit #1" -d "1000000 0"
    10 hg update 0
    10 hg update 0
    11 echo This is file c1 > c
    11 echo This is file c1 > c
    12 hg add c
    12 hg add c
    13 hg commit -m "commit #2" -d "0 0"
    13 hg commit -m "commit #2" -d "1000000 0"
    14 hg update -m 1
    14 hg update -m 1
    15 rm b
    15 rm b
    16 echo This is file c22 > c
    16 echo This is file c22 > c
    17 hg commit -m "commit #3" -d "0 0"
    17 hg commit -m "commit #3" -d "1000000 0"