Mercurial > hg
annotate tests/test-convert-svn-branches.out @ 6543:a6e2e60b34d0
convert: handle past or foreign partial svn copies
Subversion allows revisions to be composed of subparts coming from revisions
before the parent or from other part of the repository. There is no simple
representation for these now, keep the changes but do not track their origins.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 14 Apr 2008 22:31:34 +0200 |
parents | 55bd855fc0af |
children | a7492fb2107b |
rev | line source |
---|---|
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
1 % initial svn import |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
2 Adding projA/trunk |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
3 Adding projA/branches |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
4 Adding projA/tags |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
5 |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
6 Committed revision 1. |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
7 % update svn repository |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
8 A A/trunk |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
9 A A/branches |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
10 A A/tags |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
11 Checked out revision 1. |
6537
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
12 A trunk/a |
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
13 A trunk/b |
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
14 A trunk/c |
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
15 A branches/notinbranch |
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
16 Adding branches/notinbranch |
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
17 Adding trunk/a |
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
18 Adding trunk/b |
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
19 Adding trunk/c |
6491
2bdd43246c95
convert: check svn branches are directories
Patrick Mezard <pmezard@gmail.com>
parents:
5913
diff
changeset
|
20 Transmitting file data .... |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
21 Committed revision 2. |
6537
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
22 % branch to old |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
23 A branches/old |
6537
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
24 D branches/old/c |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
25 Adding branches/old |
6537
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
26 Adding branches/old/a |
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
27 Adding branches/old/b |
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
28 Deleting branches/old/c |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
29 |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
30 Committed revision 3. |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
31 At revision 3. |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
32 % update trunk |
6537
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
33 Sending trunk/a |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
34 Transmitting file data . |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
35 Committed revision 4. |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
36 % update old branch |
6537
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
37 Sending branches/old/b |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
38 Transmitting file data . |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
39 Committed revision 5. |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
40 % create a cross-branch revision |
6537
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
41 A branches/old/c |
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
42 D trunk/b |
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
43 Adding branches/old/c |
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
44 Deleting trunk/b |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
45 Transmitting file data . |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
46 Committed revision 6. |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
47 % update old branch again |
6537
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
48 Sending branches/old/b |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
49 Transmitting file data . |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
50 Committed revision 7. |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
51 % move back and forth between branch of similar names |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
52 At revision 7. |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
53 A branches/old2 |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
54 D branches/old/a |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
55 D branches/old/b |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
56 D branches/old/c |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
57 D branches/old |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
58 Deleting branches/old |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
59 Adding branches/old2 |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
60 |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
61 Committed revision 8. |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
62 A branches/old |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
63 D branches/old2/a |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
64 D branches/old2/b |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
65 D branches/old2/c |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
66 D branches/old2 |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
67 Adding branches/old |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
68 Deleting branches/old2 |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
69 |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
70 Committed revision 9. |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
71 % update trunk again |
6537
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
72 Sending trunk/a |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
73 Transmitting file data . |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
74 Committed revision 10. |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
75 % convert trunk and branches |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
76 initializing destination A-hg repository |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
77 scanning source... |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
78 sorting... |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
79 converting... |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
80 10 init projA |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
81 9 hello |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
82 8 branch trunk, remove c |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
83 7 change a |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
84 6 change b |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
85 5 move and update c |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
86 4 move and update c |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
87 3 change b again |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
88 2 move to old2 |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
89 1 move back to old |
6537
b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com>
parents:
6491
diff
changeset
|
90 0 last change to a |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
91 % branch again from a converted revision |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
92 Checked out revision 1. |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
93 A branches/old3 |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
94 Adding branches/old3 |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
95 |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
96 Committed revision 11. |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
97 % convert again |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
98 scanning source... |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
99 sorting... |
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
100 converting... |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
101 0 branch trunk@1 into old3 |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
102 o branch=old3 11 branch trunk@1 into old3 files: |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
103 | |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
104 | o branch= 10 last change to a files: a |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
105 | | |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
106 | | o branch=old 9 move back to old files: |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
107 | | | |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
108 | | o branch=old2 8 move to old2 files: |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
109 | | | |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
110 | | o branch=old 7 change b again files: b |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
111 | | | |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
112 | o | branch= 6 move and update c files: b |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
113 | | | |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
114 | | o branch=old 5 move and update c files: c |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
115 | | | |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
116 | | o branch=old 4 change b files: b |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
117 | | | |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
118 | o | branch= 3 change a files: a |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
119 | | | |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
120 +---o branch=old 2 branch trunk, remove c files: a b |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
121 | | |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
122 | o branch= 1 hello files: a b c |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
123 |/ |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
124 o branch= 0 init projA files: |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
125 |
6540
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
126 old3 11: |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
127 default 10: |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
128 old 9: |
55bd855fc0af
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com>
parents:
6537
diff
changeset
|
129 old2 8: |
5874
866aa7ae2612
Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
130 tip |