tests/test-merge2.out
changeset 808 8f5637f0a0c0
parent 767 61ed30e82b27
parent 801 1f9ec150a476
child 814 0902ffece4b4
equal deleted inserted replaced
788:64d2a558c943 808:8f5637f0a0c0
     1 + mkdir t
       
     2 + cd t
       
     3 + hg init
     1 + hg init
     4 + echo This is file a1
       
     5 + hg add a
     2 + hg add a
     6 + hg commit -m 'commit #0' -d '0 0'
     3 + hg commit -m commit #0 -d 0 0
     7 + echo This is file b1
       
     8 + hg add b
     4 + hg add b
     9 + hg commit -m 'commit #1' -d '0 0'
     5 + hg commit -m commit #1 -d 0 0
    10 + rm b
       
    11 + hg update 0
     6 + hg update 0
    12 + echo This is file b2
       
    13 + hg add b
     7 + hg add b
    14 + hg commit -m 'commit #2' -d '0 0'
     8 + hg commit -m commit #2 -d 0 0
    15 + cd ..
       
    16 + /bin/rm -rf t
       
    17 + mkdir t
       
    18 + cd t
       
    19 + hg init
     9 + hg init
    20 + echo This is file a1
       
    21 + hg add a
    10 + hg add a
    22 + hg commit -m 'commit #0' -d '0 0'
    11 + hg commit -m commit #0 -d 0 0
    23 + echo This is file b1
       
    24 + hg add b
    12 + hg add b
    25 + hg commit -m 'commit #1' -d '0 0'
    13 + hg commit -m commit #1 -d 0 0
    26 + rm b
       
    27 + hg update 0
    14 + hg update 0
    28 + echo This is file b2
    15 + hg commit -A -m commit #2 -d 0 0
    29 + hg commit -A -m 'commit #2' -d '0 0'
       
    30 adding b
    16 adding b
    31 + cd ..
       
    32 + /bin/rm -rf t
       
    33 + mkdir t
       
    34 + cd t
       
    35 + hg init
    17 + hg init
    36 + echo This is file a1
       
    37 + hg add a
    18 + hg add a
    38 + hg commit -m 'commit #0' -d '0 0'
    19 + hg commit -m commit #0 -d 0 0
    39 + echo This is file b1
       
    40 + hg add b
    20 + hg add b
    41 + hg commit -m 'commit #1' -d '0 0'
    21 + hg commit -m commit #1 -d 0 0
    42 + rm b
       
    43 + hg remove b
    22 + hg remove b
    44 + hg update 0
    23 + hg update 0
    45 + echo This is file b2
    24 + hg commit -A -m commit #2 -d 0 0
    46 + hg commit -A -m 'commit #2' -d '0 0'
       
    47 adding b
    25 adding b
    48 + cd ..
       
    49 + /bin/rm -rf t