2008-01-18 01:46:56 +03:00
|
|
|
% initial svn import
|
|
|
|
Adding projA/trunk
|
|
|
|
Adding projA/branches
|
|
|
|
Adding projA/tags
|
|
|
|
|
|
|
|
Committed revision 1.
|
|
|
|
% update svn repository
|
|
|
|
A A/trunk
|
|
|
|
A A/branches
|
|
|
|
A A/tags
|
|
|
|
Checked out revision 1.
|
2008-04-15 00:31:33 +04:00
|
|
|
A trunk/a
|
|
|
|
A trunk/b
|
|
|
|
A trunk/c
|
|
|
|
A branches/notinbranch
|
|
|
|
Adding branches/notinbranch
|
|
|
|
Adding trunk/a
|
|
|
|
Adding trunk/b
|
|
|
|
Adding trunk/c
|
2008-04-07 13:59:20 +04:00
|
|
|
Transmitting file data ....
|
2008-01-18 01:46:56 +03:00
|
|
|
Committed revision 2.
|
2008-04-15 00:31:33 +04:00
|
|
|
% branch to old
|
2008-01-18 01:46:56 +03:00
|
|
|
A branches/old
|
2008-04-15 00:31:33 +04:00
|
|
|
D branches/old/c
|
2008-01-18 01:46:56 +03:00
|
|
|
Adding branches/old
|
2008-04-15 00:31:33 +04:00
|
|
|
Adding branches/old/a
|
|
|
|
Adding branches/old/b
|
|
|
|
Deleting branches/old/c
|
2008-01-18 01:46:56 +03:00
|
|
|
|
|
|
|
Committed revision 3.
|
|
|
|
At revision 3.
|
|
|
|
% update trunk
|
2008-04-15 00:31:33 +04:00
|
|
|
Sending trunk/a
|
2008-01-18 01:46:56 +03:00
|
|
|
Transmitting file data .
|
|
|
|
Committed revision 4.
|
|
|
|
% update old branch
|
2008-04-15 00:31:33 +04:00
|
|
|
Sending branches/old/b
|
2008-01-18 01:46:56 +03:00
|
|
|
Transmitting file data .
|
|
|
|
Committed revision 5.
|
|
|
|
% create a cross-branch revision
|
2008-04-15 00:31:33 +04:00
|
|
|
A branches/old/c
|
|
|
|
D trunk/b
|
|
|
|
Adding branches/old/c
|
|
|
|
Deleting trunk/b
|
2008-01-18 01:46:56 +03:00
|
|
|
Transmitting file data .
|
|
|
|
Committed revision 6.
|
|
|
|
% update old branch again
|
2008-04-15 00:31:33 +04:00
|
|
|
Sending branches/old/b
|
2008-01-18 01:46:56 +03:00
|
|
|
Transmitting file data .
|
|
|
|
Committed revision 7.
|
2008-04-15 00:31:33 +04:00
|
|
|
% move back and forth between branch of similar names
|
|
|
|
At revision 7.
|
|
|
|
A branches/old2
|
|
|
|
D branches/old/a
|
|
|
|
D branches/old/b
|
|
|
|
D branches/old/c
|
|
|
|
D branches/old
|
|
|
|
Deleting branches/old
|
|
|
|
Adding branches/old2
|
|
|
|
|
|
|
|
Committed revision 8.
|
|
|
|
A branches/old
|
|
|
|
D branches/old2/a
|
|
|
|
D branches/old2/b
|
|
|
|
D branches/old2/c
|
|
|
|
D branches/old2
|
|
|
|
Adding branches/old
|
|
|
|
Deleting branches/old2
|
|
|
|
|
|
|
|
Committed revision 9.
|
2008-01-18 01:46:56 +03:00
|
|
|
% update trunk again
|
2008-04-15 00:31:33 +04:00
|
|
|
Sending trunk/a
|
2008-01-18 01:46:56 +03:00
|
|
|
Transmitting file data .
|
2008-04-15 00:31:33 +04:00
|
|
|
Committed revision 10.
|
2008-01-18 01:46:56 +03:00
|
|
|
% convert trunk and branches
|
|
|
|
initializing destination A-hg repository
|
|
|
|
scanning source...
|
|
|
|
sorting...
|
|
|
|
converting...
|
2008-04-15 00:31:33 +04:00
|
|
|
10 init projA
|
|
|
|
9 hello
|
|
|
|
8 branch trunk, remove c
|
|
|
|
7 change a
|
|
|
|
6 change b
|
|
|
|
5 move and update c
|
|
|
|
4 move and update c
|
|
|
|
3 change b again
|
|
|
|
2 move to old2
|
|
|
|
1 move back to old
|
2008-04-15 00:31:33 +04:00
|
|
|
0 last change to a
|
2008-01-18 01:46:56 +03:00
|
|
|
% branch again from a converted revision
|
|
|
|
Checked out revision 1.
|
2008-04-15 00:31:33 +04:00
|
|
|
A branches/old3
|
|
|
|
Adding branches/old3
|
2008-01-18 01:46:56 +03:00
|
|
|
|
2008-04-15 00:31:33 +04:00
|
|
|
Committed revision 11.
|
2008-01-18 01:46:56 +03:00
|
|
|
% convert again
|
|
|
|
scanning source...
|
|
|
|
sorting...
|
|
|
|
converting...
|
2008-04-15 00:31:33 +04:00
|
|
|
0 branch trunk@1 into old3
|
|
|
|
o branch=old3 11 branch trunk@1 into old3 files:
|
2008-01-18 01:46:56 +03:00
|
|
|
|
|
2008-04-15 00:31:33 +04:00
|
|
|
| o branch= 10 last change to a files: a
|
2008-01-18 01:46:56 +03:00
|
|
|
| |
|
2008-04-15 00:31:33 +04:00
|
|
|
| | o branch=old 9 move back to old files:
|
|
|
|
| | |
|
|
|
|
| | o branch=old2 8 move to old2 files:
|
|
|
|
| | |
|
|
|
|
| | o branch=old 7 change b again files: b
|
2008-01-18 01:46:56 +03:00
|
|
|
| | |
|
2008-04-15 00:31:33 +04:00
|
|
|
| o | branch= 6 move and update c files: b
|
2008-01-18 01:46:56 +03:00
|
|
|
| | |
|
2008-04-15 00:31:33 +04:00
|
|
|
| | o branch=old 5 move and update c files: c
|
2008-01-18 01:46:56 +03:00
|
|
|
| | |
|
2008-04-15 00:31:33 +04:00
|
|
|
| | o branch=old 4 change b files: b
|
2008-01-18 01:46:56 +03:00
|
|
|
| | |
|
2008-04-15 00:31:33 +04:00
|
|
|
| o | branch= 3 change a files: a
|
2008-01-18 01:46:56 +03:00
|
|
|
| | |
|
2008-04-15 00:31:34 +04:00
|
|
|
| | o branch=old 2 branch trunk, remove c files: a b
|
2008-04-15 00:31:34 +04:00
|
|
|
| |/
|
2008-04-15 00:31:33 +04:00
|
|
|
| o branch= 1 hello files: a b c
|
2008-01-18 01:46:56 +03:00
|
|
|
|/
|
2008-04-15 00:31:33 +04:00
|
|
|
o branch= 0 init projA files:
|
2008-01-18 01:46:56 +03:00
|
|
|
|
2008-04-15 00:31:33 +04:00
|
|
|
old3 11:
|
|
|
|
default 10:
|
|
|
|
old 9:
|
|
|
|
old2 8:
|
2008-01-18 01:46:56 +03:00
|
|
|
tip
|