tests/test-convert-svn-branches.out
changeset 6537 b6a24c273c30
parent 6491 2bdd43246c95
child 6540 55bd855fc0af
equal deleted inserted replaced
6536:dfdef3d560a8 6537:b6a24c273c30
     7 % update svn repository
     7 % update svn repository
     8 A    A/trunk
     8 A    A/trunk
     9 A    A/branches
     9 A    A/branches
    10 A    A/tags
    10 A    A/tags
    11 Checked out revision 1.
    11 Checked out revision 1.
    12 A         trunk/letter.txt
    12 A         trunk/a
    13 A         trunk/letter2.txt
    13 A         trunk/b
    14 A         trunk/letter3.txt
    14 A         trunk/c
    15 A         branches/readme.txt
    15 A         branches/notinbranch
    16 Adding         branches/readme.txt
    16 Adding         branches/notinbranch
    17 Adding         trunk/letter.txt
    17 Adding         trunk/a
    18 Adding         trunk/letter2.txt
    18 Adding         trunk/b
    19 Adding         trunk/letter3.txt
    19 Adding         trunk/c
    20 Transmitting file data ....
    20 Transmitting file data ....
    21 Committed revision 2.
    21 Committed revision 2.
    22 % branch to old letters
    22 % branch to old
    23 A         branches/old
    23 A         branches/old
    24 D         branches/old/letter3.txt
    24 D         branches/old/c
    25 Adding         branches/old
    25 Adding         branches/old
    26 Adding         branches/old/letter.txt
    26 Adding         branches/old/a
    27 Adding         branches/old/letter2.txt
    27 Adding         branches/old/b
    28 Deleting       branches/old/letter3.txt
    28 Deleting       branches/old/c
    29 
    29 
    30 Committed revision 3.
    30 Committed revision 3.
    31 At revision 3.
    31 At revision 3.
    32 % update trunk
    32 % update trunk
    33 Sending        trunk/letter.txt
    33 Sending        trunk/a
    34 Transmitting file data .
    34 Transmitting file data .
    35 Committed revision 4.
    35 Committed revision 4.
    36 % update old branch
    36 % update old branch
    37 Sending        branches/old/letter2.txt
    37 Sending        branches/old/b
    38 Transmitting file data .
    38 Transmitting file data .
    39 Committed revision 5.
    39 Committed revision 5.
    40 % create a cross-branch revision
    40 % create a cross-branch revision
    41 A         branches/old/letter3.txt
    41 A         branches/old/c
    42 D         trunk/letter2.txt
    42 D         trunk/b
    43 Adding         branches/old/letter3.txt
    43 Adding         branches/old/c
    44 Deleting       trunk/letter2.txt
    44 Deleting       trunk/b
    45 Transmitting file data .
    45 Transmitting file data .
    46 Committed revision 6.
    46 Committed revision 6.
    47 % update old branch again
    47 % update old branch again
    48 Sending        branches/old/letter2.txt
    48 Sending        branches/old/b
    49 Transmitting file data .
    49 Transmitting file data .
    50 Committed revision 7.
    50 Committed revision 7.
    51 % update trunk again
    51 % update trunk again
    52 Sending        trunk/letter.txt
    52 Sending        trunk/a
    53 Transmitting file data .
    53 Transmitting file data .
    54 Committed revision 8.
    54 Committed revision 8.
    55 % convert trunk and branches
    55 % convert trunk and branches
    56 initializing destination A-hg repository
    56 initializing destination A-hg repository
    57 scanning source...
    57 scanning source...
    58 sorting...
    58 sorting...
    59 converting...
    59 converting...
    60 8 init projA
    60 8 init projA
    61 7 hello
    61 7 hello
    62 6 branch trunk, remove letter3
    62 6 branch trunk, remove c
    63 5 change letter
    63 5 change a
    64 4 change letter2
    64 4 change b
    65 3 move and update letter3.txt
    65 3 move and update c
    66 2 move and update letter3.txt
    66 2 move and update c
    67 1 change letter2 again
    67 1 change b again
    68 0 last change to letter
    68 0 last change to a
    69 % branch again from a converted revision
    69 % branch again from a converted revision
    70 Checked out revision 1.
    70 Checked out revision 1.
    71 A         branches/old2
    71 A         branches/old2
    72 Adding         branches/old2
    72 Adding         branches/old2
    73 
    73 
    77 sorting...
    77 sorting...
    78 converting...
    78 converting...
    79 0 branch trunk@1 into old2
    79 0 branch trunk@1 into old2
    80 o  9 branch trunk@1 into old2 files:
    80 o  9 branch trunk@1 into old2 files:
    81 |
    81 |
    82 | o  8 last change to letter files: letter.txt
    82 | o  8 last change to a files: a
    83 | |
    83 | |
    84 | | o  7 change letter2 again files: letter2.txt
    84 | | o  7 change b again files: b
    85 | | |
    85 | | |
    86 | o |  6 move and update letter3.txt files: letter2.txt
    86 | o |  6 move and update c files: b
    87 | | |
    87 | | |
    88 | | o  5 move and update letter3.txt files: letter3.txt
    88 | | o  5 move and update c files: c
    89 | | |
    89 | | |
    90 | | o  4 change letter2 files: letter2.txt
    90 | | o  4 change b files: b
    91 | | |
    91 | | |
    92 | o |  3 change letter files: letter.txt
    92 | o |  3 change a files: a
    93 | | |
    93 | | |
    94 +---o  2 branch trunk, remove letter3 files: letter.txt letter2.txt
    94 +---o  2 branch trunk, remove c files: a b
    95 | |
    95 | |
    96 | o  1 hello files: letter.txt letter2.txt letter3.txt
    96 | o  1 hello files: a b c
    97 |/
    97 |/
    98 o  0 init projA files:
    98 o  0 init projA files:
    99 
    99 
   100 old2                           9:
   100 old2                           9:
   101 default                        8:
   101 default                        8: