Mercurial > hg
comparison tests/test-convert-svn-sink.out @ 5513:f0c58fd4b798
convert: add support for Subversion as a sink
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 07 Nov 2007 18:26:59 -0800 |
parents | |
children | dc8fa3482a9a |
comparison
equal
deleted
inserted
replaced
5512:8cd26ccc68f8 | 5513:f0c58fd4b798 |
---|---|
1 % add | |
2 adding a | |
3 % modify | |
4 1:10307c220ed9 | |
5 assuming destination a-hg | |
6 initializing svn repo 'a-hg' | |
7 initializing svn wc 'a-hg-wc' | |
8 scanning source... | |
9 sorting... | |
10 converting... | |
11 1 add a file | |
12 0 modify a file | |
13 At revision 2. | |
14 2 2 test . | |
15 2 2 test a | |
16 <?xml version="1.0"?> | |
17 <log> | |
18 <logentry | |
19 revision="2"> | |
20 <author>test</author> | |
21 <date/> | |
22 <paths> | |
23 <path | |
24 action="M">/a</path> | |
25 </paths> | |
26 <msg>modify a file</msg> | |
27 </logentry> | |
28 <logentry | |
29 revision="1"> | |
30 <author>test</author> | |
31 <date/> | |
32 <paths> | |
33 <path | |
34 action="A">/a</path> | |
35 </paths> | |
36 <msg>add a file</msg> | |
37 </logentry> | |
38 </log> | |
39 a: | |
40 a | |
41 | |
42 a-hg-wc: | |
43 a | |
44 same | |
45 % rename | |
46 2:6e45a219686e | |
47 assuming destination a-hg | |
48 initializing svn wc 'a-hg-wc' | |
49 scanning source... | |
50 sorting... | |
51 converting... | |
52 0 rename a file | |
53 At revision 3. | |
54 3 3 test . | |
55 3 3 test b | |
56 <?xml version="1.0"?> | |
57 <log> | |
58 <logentry | |
59 revision="3"> | |
60 <author>test</author> | |
61 <date/> | |
62 <paths> | |
63 <path | |
64 action="D">/a</path> | |
65 <path | |
66 copyfrom-path="/a" | |
67 copyfrom-rev="2" | |
68 action="A">/b</path> | |
69 </paths> | |
70 <msg>rename a file</msg> | |
71 </logentry> | |
72 </log> | |
73 a: | |
74 b | |
75 | |
76 a-hg-wc: | |
77 b | |
78 % copy | |
79 3:d811dc81efbb | |
80 assuming destination a-hg | |
81 initializing svn wc 'a-hg-wc' | |
82 scanning source... | |
83 sorting... | |
84 converting... | |
85 0 copy a file | |
86 At revision 4. | |
87 4 4 test . | |
88 4 3 test b | |
89 4 4 test c | |
90 <?xml version="1.0"?> | |
91 <log> | |
92 <logentry | |
93 revision="4"> | |
94 <author>test</author> | |
95 <date/> | |
96 <paths> | |
97 <path | |
98 copyfrom-path="/b" | |
99 copyfrom-rev="3" | |
100 action="A">/c</path> | |
101 </paths> | |
102 <msg>copy a file</msg> | |
103 </logentry> | |
104 </log> | |
105 a: | |
106 b | |
107 c | |
108 | |
109 a-hg-wc: | |
110 b | |
111 c | |
112 % remove | |
113 4:045e93063aca | |
114 assuming destination a-hg | |
115 initializing svn wc 'a-hg-wc' | |
116 scanning source... | |
117 sorting... | |
118 converting... | |
119 0 remove a file | |
120 At revision 5. | |
121 5 5 test . | |
122 5 4 test c | |
123 <?xml version="1.0"?> | |
124 <log> | |
125 <logentry | |
126 revision="5"> | |
127 <author>test</author> | |
128 <date/> | |
129 <paths> | |
130 <path | |
131 action="D">/b</path> | |
132 </paths> | |
133 <msg>remove a file</msg> | |
134 </logentry> | |
135 </log> | |
136 a: | |
137 c | |
138 | |
139 a-hg-wc: | |
140 c | |
141 % executable | |
142 5:7eda3f4b5331 | |
143 svn: Path 'b' does not exist | |
144 assuming destination a-hg | |
145 initializing svn wc 'a-hg-wc' | |
146 scanning source... | |
147 sorting... | |
148 converting... | |
149 0 make a file executable | |
150 abort: svn exited with status 1 | |
151 At revision 5. | |
152 5 5 test . | |
153 M 5 4 test c | |
154 <?xml version="1.0"?> | |
155 <log> | |
156 <logentry | |
157 revision="5"> | |
158 <author>test</author> | |
159 <date/> | |
160 <paths> | |
161 <path | |
162 action="D">/b</path> | |
163 </paths> | |
164 <msg>remove a file</msg> | |
165 </logentry> | |
166 </log> | |
167 executable | |
168 % branchy history | |
169 adding b | |
170 adding left-1 | |
171 adding left-2 | |
172 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
173 adding right-1 | |
174 adding right-2 | |
175 3 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
176 warning: conflicts during merge. | |
177 merging b | |
178 merging b failed! | |
179 2 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
180 There are unresolved merges, you can redo the full merge using: | |
181 hg update -C 2 | |
182 hg merge 4 | |
183 assuming destination b-hg | |
184 initializing svn repo 'b-hg' | |
185 initializing svn wc 'b-hg-wc' | |
186 scanning source... | |
187 sorting... | |
188 converting... | |
189 5 base | |
190 4 left-1 | |
191 3 left-2 | |
192 2 right-1 | |
193 1 right-2 | |
194 0 merge | |
195 % expect 4 changes | |
196 At revision 4. | |
197 4 4 test . | |
198 4 3 test b | |
199 4 2 test left-1 | |
200 4 3 test left-2 | |
201 4 4 test right-1 | |
202 4 4 test right-2 | |
203 <?xml version="1.0"?> | |
204 <log> | |
205 <logentry | |
206 revision="4"> | |
207 <author>test</author> | |
208 <date/> | |
209 <paths> | |
210 <path | |
211 action="A">/right-1</path> | |
212 <path | |
213 action="A">/right-2</path> | |
214 </paths> | |
215 <msg>merge</msg> | |
216 </logentry> | |
217 <logentry | |
218 revision="3"> | |
219 <author>test</author> | |
220 <date/> | |
221 <paths> | |
222 <path | |
223 action="M">/b</path> | |
224 <path | |
225 action="A">/left-2</path> | |
226 </paths> | |
227 <msg>left-2</msg> | |
228 </logentry> | |
229 <logentry | |
230 revision="2"> | |
231 <author>test</author> | |
232 <date/> | |
233 <paths> | |
234 <path | |
235 action="M">/b</path> | |
236 <path | |
237 action="A">/left-1</path> | |
238 </paths> | |
239 <msg>left-1</msg> | |
240 </logentry> | |
241 <logentry | |
242 revision="1"> | |
243 <author>test</author> | |
244 <date/> | |
245 <paths> | |
246 <path | |
247 action="A">/b</path> | |
248 </paths> | |
249 <msg>base</msg> | |
250 </logentry> | |
251 </log> |