tests/test-merge2
changeset 3988 9dcf9d45cab8
parent 1933 7544700fd931
equal deleted inserted replaced
3987:c6f10448278f 3988:9dcf9d45cab8
    12 rm b
    12 rm b
    13 hg update 0
    13 hg update 0
    14 echo This is file b2 > b
    14 echo This is file b2 > b
    15 hg add b
    15 hg add b
    16 hg commit -m "commit #2" -d "1000000 0"
    16 hg commit -m "commit #2" -d "1000000 0"
    17 cd ..; /bin/rm -rf t
    17 cd ..; rm -r t
    18 
    18 
    19 mkdir t
    19 mkdir t
    20 cd t
    20 cd t
    21 hg init
    21 hg init
    22 echo This is file a1 > a
    22 echo This is file a1 > a
    27 hg commit -m "commit #1" -d "1000000 0"
    27 hg commit -m "commit #1" -d "1000000 0"
    28 rm b
    28 rm b
    29 hg update 0
    29 hg update 0
    30 echo This is file b2 > b
    30 echo This is file b2 > b
    31 hg commit -A -m "commit #2" -d "1000000 0"
    31 hg commit -A -m "commit #2" -d "1000000 0"
    32 cd ..; /bin/rm -rf t
    32 cd ..; rm -r t
    33 
    33 
    34 mkdir t
    34 mkdir t
    35 cd t
    35 cd t
    36 hg init
    36 hg init
    37 echo This is file a1 > a
    37 echo This is file a1 > a
    43 rm b
    43 rm b
    44 hg remove b
    44 hg remove b
    45 hg update 0
    45 hg update 0
    46 echo This is file b2 > b
    46 echo This is file b2 > b
    47 hg commit -A -m "commit #2" -d "1000000 0"
    47 hg commit -A -m "commit #2" -d "1000000 0"
    48 cd ..; /bin/rm -rf t