1 % create subversion repo |
1 % create subversion repo |
2 Checked out revision 0. |
2 Checked out revision 0. |
3 A alpha |
3 A src |
4 Adding alpha |
4 A src/alpha |
5 Transmitting file data . |
5 A externals |
|
6 A externals/other |
|
7 Adding externals |
|
8 Adding externals/other |
|
9 Adding src |
|
10 Adding src/alpha |
|
11 Transmitting file data .. |
6 Committed revision 1. |
12 Committed revision 1. |
|
13 At revision 1. |
|
14 property 'svn:externals' set on 'src' |
|
15 Sending src |
|
16 |
|
17 Committed revision 2. |
7 % create hg repo |
18 % create hg repo |
8 % first revision, no sub |
19 % first revision, no sub |
9 adding a |
20 adding a |
10 % add first svn sub |
21 % add first svn sub |
11 committing subrepository s |
22 committing subrepository s |
12 % debugsub |
23 % debugsub |
13 path s |
24 path s |
14 source file:///root/svn-repo |
25 source file:///root/svn-repo/src |
15 revision 1 |
26 revision 2 |
16 |
27 |
17 % change file in svn and hg, commit |
28 % change file in svn and hg, commit |
18 committing subrepository s |
29 committing subrepository s |
19 Sending s/alpha |
30 Sending s/alpha |
20 Transmitting file data . |
31 Transmitting file data . |
21 Committed revision 2. |
32 Committed revision 3. |
22 At revision 2. |
33 |
|
34 Fetching external item into 's/externals' |
|
35 External at revision 1. |
|
36 |
|
37 At revision 3. |
23 path s |
38 path s |
24 source file:///root/svn-repo |
39 source file:///root/svn-repo/src |
25 revision 2 |
40 revision 3 |
26 |
41 |
27 % should be empty despite change to s/a |
42 % should be empty despite change to s/a |
28 |
43 |
29 % add a commit from svn |
44 % add a commit from svn |
30 U alpha |
45 U alpha |
31 Updated to revision 2. |
46 |
32 Sending alpha |
47 Fetching external item into 'externals' |
|
48 A externals/other |
|
49 Updated external to revision 1. |
|
50 |
|
51 Updated to revision 3. |
|
52 property 'svn:mime-type' set on 'alpha' |
|
53 Sending src/alpha |
33 Transmitting file data . |
54 Transmitting file data . |
34 Committed revision 3. |
55 Committed revision 4. |
35 % this commit from hg will fail |
56 % this commit from hg will fail |
36 committing subrepository s |
57 committing subrepository s |
37 abort: svn: Commit failed (details follow): |
58 abort: svn: Commit failed (details follow): |
38 svn: File '/alpha' is out of date |
59 svn: File '/src/alpha' is out of date |
|
60 % this commit fails because of meta changes |
|
61 property 'svn:mime-type' set on 's/alpha' |
|
62 committing subrepository s |
|
63 abort: svn: Commit failed (details follow): |
|
64 svn: File '/src/alpha' is out of date |
|
65 % this commit fails because of externals changes |
|
66 committing subrepository s |
|
67 abort: cannot commit svn externals |
|
68 % this commit fails because of externals meta changes |
|
69 property 'svn:mime-type' set on 's/externals/other' |
|
70 committing subrepository s |
|
71 abort: cannot commit svn externals |
39 |
72 |
40 % clone |
73 % clone |
41 updating to branch default |
74 updating to branch default |
42 A s/alpha |
75 A s/alpha |
43 Checked out revision 2. |
76 U s |
|
77 |
|
78 Fetching external item into 's/externals' |
|
79 A s/externals/other |
|
80 Checked out external at revision 1. |
|
81 |
|
82 Checked out revision 3. |
44 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
83 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
45 % debugsub in clone |
84 % debugsub in clone |
46 path s |
85 path s |
47 source file:///root/svn-repo |
86 source file:///root/svn-repo/src |
48 revision 2 |
87 revision 3 |