Mercurial > public > mercurial-scm > hg
diff tests/test-convert-svn-move.out @ 5957:971a17af5982
convert: prevent svn branches to leave the root module tree
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sat, 26 Jan 2008 14:45:04 +0100 |
| parents | c4496b7c10ce |
| children | a6e2e60b34d0 |
line wrap: on
line diff
--- a/tests/test-convert-svn-move.out Sat Jan 26 14:45:04 2008 +0100 +++ b/tests/test-convert-svn-move.out Sat Jan 26 14:45:04 2008 +0100 @@ -1,46 +1,56 @@ % initial svn import Adding projA/trunk +Adding projA/trunk/a Adding projA/trunk/d1 Adding projA/trunk/d1/b +Adding projA/trunk/d1/c Committed revision 1. % update svn repository A A/trunk +A A/trunk/a A A/trunk/d1 A A/trunk/d1/b +A A/trunk/d1/c Checked out revision 1. +Sending trunk/a +Sending trunk/d1/c +Transmitting file data .. +Committed revision 2. -Committed revision 2. +Committed revision 3. D trunk A subproject +A subproject/a A subproject/d1 A subproject/d1/b -Updated to revision 2. +A subproject/d1/c +Updated to revision 3. A subproject/trunk Adding subproject/trunk -Committed revision 3. +Committed revision 4. A subproject/branches Adding subproject/branches -Committed revision 4. +Committed revision 5. -Committed revision 5. +Committed revision 6. A subproject/trunk/d1 A subproject/trunk/d1/b +A subproject/trunk/d1/c D subproject/d1 -Updated to revision 5. +Updated to revision 6. Sending subproject/trunk/d1/b Transmitting file data . -Committed revision 6. +Committed revision 7. -Committed revision 7. +Committed revision 8. % convert trunk and branches initializing destination A-hg repository scanning source... sorting... converting... -7 init projA 6 createtrunk 5 moved1 4 moved1 @@ -48,21 +58,19 @@ 2 changeb 1 moved1again 0 moved1again -o 7 moved1again files: d1/b +o 6 moved1again files: d1/b d1/c | -| o 6 moved1again files: +| o 5 moved1again files: | | -o | 5 changeb files: d1/b +o | 4 changeb files: d1/b | | -| o 4 changeb files: b +| o 3 changeb files: b | | -o | 3 moved1 files: d1/b -| | -| o 2 moved1 files: +o | 2 moved1 files: d1/b d1/c | | -o | 1 createtrunk files: - / -o 0 init projA files: b +| o 1 moved1 files: b c +| +o 0 createtrunk files: -default 7: -d1 6: +default 6: +d1 5: