tests/test-merge2.t
changeset 12156 4c94b6d0fb1c
parent 11976 b28fc3b3efd6
child 13956 ffb5c09ba822
equal deleted inserted replaced
12155:94ad12aa0530 12156:4c94b6d0fb1c
     1   $ mkdir t
     1   $ mkdir t
     2   $ cd t
     2   $ cd t
     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 "1000000 0"
     6   $ hg commit -m "commit #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 "1000000 0"
     9   $ hg commit -m "commit #1"
    10   $ rm b
    10   $ rm b
    11   $ hg update 0
    11   $ hg update 0
    12   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    12   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    13   $ echo This is file b2 > b
    13   $ echo This is file b2 > b
    14   $ hg add b
    14   $ hg add b
    15   $ hg commit -m "commit #2" -d "1000000 0"
    15   $ hg commit -m "commit #2"
    16   created new head
    16   created new head
    17   $ cd ..; rm -r 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
    23   $ hg add a
    23   $ hg add a
    24   $ hg commit -m "commit #0" -d "1000000 0"
    24   $ hg commit -m "commit #0"
    25   $ echo This is file b1 > b
    25   $ echo This is file b1 > b
    26   $ hg add b
    26   $ hg add b
    27   $ hg commit -m "commit #1" -d "1000000 0"
    27   $ hg commit -m "commit #1"
    28   $ rm b
    28   $ rm b
    29   $ hg update 0
    29   $ hg update 0
    30   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    30   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    31   $ echo This is file b2 > b
    31   $ echo This is file b2 > b
    32   $ hg commit -A -m "commit #2" -d "1000000 0"
    32   $ hg commit -A -m "commit #2"
    33   adding b
    33   adding b
    34   created new head
    34   created new head
    35   $ cd ..; rm -r t
    35   $ cd ..; rm -r t
    36 
    36 
    37   $ mkdir t
    37   $ mkdir t
    38   $ cd t
    38   $ cd t
    39   $ hg init
    39   $ hg init
    40   $ echo This is file a1 > a
    40   $ echo This is file a1 > a
    41   $ hg add a
    41   $ hg add a
    42   $ hg commit -m "commit #0" -d "1000000 0"
    42   $ hg commit -m "commit #0"
    43   $ echo This is file b1 > b
    43   $ echo This is file b1 > b
    44   $ hg add b
    44   $ hg add b
    45   $ hg commit -m "commit #1" -d "1000000 0"
    45   $ hg commit -m "commit #1"
    46   $ rm b
    46   $ rm b
    47   $ hg remove b
    47   $ hg remove b
    48   $ hg update 0
    48   $ hg update 0
    49   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    49   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    50   $ echo This is file b2 > b
    50   $ echo This is file b2 > b
    51   $ hg commit -A -m "commit #2" -d "1000000 0"
    51   $ hg commit -A -m "commit #2"
    52   adding b
    52   adding b
    53   created new head
    53   created new head