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