Mercurial > hg
comparison tests/test-convert-svn-branches.out @ 6540:55bd855fc0af
convert: improve subversion branch filtering
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Mon, 14 Apr 2008 22:31:33 +0200 |
| parents | b6a24c273c30 |
| children | a7492fb2107b |
comparison
equal
deleted
inserted
replaced
| 6539:7814d7bb77bc | 6540:55bd855fc0af |
|---|---|
| 46 Committed revision 6. | 46 Committed revision 6. |
| 47 % update old branch again | 47 % update old branch again |
| 48 Sending branches/old/b | 48 Sending branches/old/b |
| 49 Transmitting file data . | 49 Transmitting file data . |
| 50 Committed revision 7. | 50 Committed revision 7. |
| 51 % move back and forth between branch of similar names | |
| 52 At revision 7. | |
| 53 A branches/old2 | |
| 54 D branches/old/a | |
| 55 D branches/old/b | |
| 56 D branches/old/c | |
| 57 D branches/old | |
| 58 Deleting branches/old | |
| 59 Adding branches/old2 | |
| 60 | |
| 61 Committed revision 8. | |
| 62 A branches/old | |
| 63 D branches/old2/a | |
| 64 D branches/old2/b | |
| 65 D branches/old2/c | |
| 66 D branches/old2 | |
| 67 Adding branches/old | |
| 68 Deleting branches/old2 | |
| 69 | |
| 70 Committed revision 9. | |
| 51 % update trunk again | 71 % update trunk again |
| 52 Sending trunk/a | 72 Sending trunk/a |
| 53 Transmitting file data . | 73 Transmitting file data . |
| 54 Committed revision 8. | 74 Committed revision 10. |
| 55 % convert trunk and branches | 75 % convert trunk and branches |
| 56 initializing destination A-hg repository | 76 initializing destination A-hg repository |
| 57 scanning source... | 77 scanning source... |
| 58 sorting... | 78 sorting... |
| 59 converting... | 79 converting... |
| 60 8 init projA | 80 10 init projA |
| 61 7 hello | 81 9 hello |
| 62 6 branch trunk, remove c | 82 8 branch trunk, remove c |
| 63 5 change a | 83 7 change a |
| 64 4 change b | 84 6 change b |
| 65 3 move and update c | 85 5 move and update c |
| 66 2 move and update c | 86 4 move and update c |
| 67 1 change b again | 87 3 change b again |
| 88 2 move to old2 | |
| 89 1 move back to old | |
| 68 0 last change to a | 90 0 last change to a |
| 69 % branch again from a converted revision | 91 % branch again from a converted revision |
| 70 Checked out revision 1. | 92 Checked out revision 1. |
| 71 A branches/old2 | 93 A branches/old3 |
| 72 Adding branches/old2 | 94 Adding branches/old3 |
| 73 | 95 |
| 74 Committed revision 9. | 96 Committed revision 11. |
| 75 % convert again | 97 % convert again |
| 76 scanning source... | 98 scanning source... |
| 77 sorting... | 99 sorting... |
| 78 converting... | 100 converting... |
| 79 0 branch trunk@1 into old2 | 101 0 branch trunk@1 into old3 |
| 80 o 9 branch trunk@1 into old2 files: | 102 o branch=old3 11 branch trunk@1 into old3 files: |
| 81 | | 103 | |
| 82 | o 8 last change to a files: a | 104 | o branch= 10 last change to a files: a |
| 83 | | | 105 | | |
| 84 | | o 7 change b again files: b | 106 | | o branch=old 9 move back to old files: |
| 85 | | | | 107 | | | |
| 86 | o | 6 move and update c files: b | 108 | | o branch=old2 8 move to old2 files: |
| 87 | | | | 109 | | | |
| 88 | | o 5 move and update c files: c | 110 | | o branch=old 7 change b again files: b |
| 89 | | | | 111 | | | |
| 90 | | o 4 change b files: b | 112 | o | branch= 6 move and update c files: b |
| 91 | | | | 113 | | | |
| 92 | o | 3 change a files: a | 114 | | o branch=old 5 move and update c files: c |
| 93 | | | | 115 | | | |
| 94 +---o 2 branch trunk, remove c files: a b | 116 | | o branch=old 4 change b files: b |
| 117 | | | | |
| 118 | o | branch= 3 change a files: a | |
| 119 | | | | |
| 120 +---o branch=old 2 branch trunk, remove c files: a b | |
| 95 | | | 121 | | |
| 96 | o 1 hello files: a b c | 122 | o branch= 1 hello files: a b c |
| 97 |/ | 123 |/ |
| 98 o 0 init projA files: | 124 o branch= 0 init projA files: |
| 99 | 125 |
| 100 old2 9: | 126 old3 11: |
| 101 default 8: | 127 default 10: |
| 102 old 7: | 128 old 9: |
| 129 old2 8: | |
| 103 tip | 130 tip |