tests/test-transplant.out
changeset 3714 198173f3957c
child 3724 ea523d6f5f1a
equal deleted inserted replaced
3713:8ae88ed2a3b6 3714:198173f3957c
       
     1 adding r1
       
     2 adding r2
       
     3 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
     4 adding b1
       
     5 adding b2
       
     6 adding b3
       
     7 4  b3
       
     8 3  b2
       
     9 2 0:17ab29e464c6  b1
       
    10 1  r2
       
    11 0  r1
       
    12 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    13 1 files updated, 0 files merged, 3 files removed, 0 files unresolved
       
    14 % rebase b onto r1
       
    15 applying 37a1297eb21b
       
    16 37a1297eb21b transplanted to e234d668f844
       
    17 applying 722f4667af76
       
    18 722f4667af76 transplanted to 539f377d78df
       
    19 applying a53251cdf717
       
    20 a53251cdf717 transplanted to ffd6818a3975
       
    21 7  b3
       
    22 6  b2
       
    23 5 1:d11e3596cc1a  b1
       
    24 4  b3
       
    25 3  b2
       
    26 2 0:17ab29e464c6  b1
       
    27 1  r2
       
    28 0  r1
       
    29 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    30 1 files updated, 0 files merged, 3 files removed, 0 files unresolved
       
    31 % rebase b onto r1, skipping b2
       
    32 applying 37a1297eb21b
       
    33 37a1297eb21b transplanted to e234d668f844
       
    34 applying a53251cdf717
       
    35 a53251cdf717 transplanted to 7275fda4d04f
       
    36 6  b3
       
    37 5 1:d11e3596cc1a  b1
       
    38 4  b3
       
    39 3  b2
       
    40 2 0:17ab29e464c6  b1
       
    41 1  r2
       
    42 0  r1
       
    43 % remote transplant
       
    44 requesting all changes
       
    45 adding changesets
       
    46 adding manifests
       
    47 adding file changes
       
    48 added 2 changesets with 2 changes to 2 files
       
    49 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    50 searching for changes
       
    51 applying 37a1297eb21b
       
    52 37a1297eb21b transplanted to c19cf0ccb069
       
    53 applying a53251cdf717
       
    54 a53251cdf717 transplanted to f7fe5bf98525
       
    55 3  b3
       
    56 (transplanted from a53251cdf717679d1907b289f991534be05c997a)
       
    57 2  b1
       
    58 (transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21)
       
    59 1  r2
       
    60 0  r1
       
    61 % skip previous transplants
       
    62 searching for changes
       
    63 applying 722f4667af76
       
    64 722f4667af76 transplanted to 47156cd86c0b
       
    65 4  b2
       
    66 3  b3
       
    67 (transplanted from a53251cdf717679d1907b289f991534be05c997a)
       
    68 2  b1
       
    69 (transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21)
       
    70 1  r2
       
    71 0  r1
       
    72 % skip local changes transplanted to the source
       
    73 adding b4
       
    74 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    75 searching for changes
       
    76 applying 4333daefcb15
       
    77 4333daefcb15 transplanted to 5f42c04e07cc