Mercurial > hgsubversion

comparison tests/fixtures/symlinks.svndump @ 741:b3128fec5d54

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
editor: handle property changes to links. Previously, property changes to links caused 'link ' to be prepended to the link destination. Removing a line that prepended it in Revision::set() appears to fix it. In these cases, the "file marked as link, but contains data" warning might be triggered. This should be safe, so it's lowered to a note and the language made less conclusive. In order to test this, extra revisions are added to the 'symlinks.svndump' fixture. As one of the new revisions add a link that points to 'link to this', a check that asserted that link destinations must not start with 'link ' was removed. This change is safe, as the test later on asserts exact equality with the contents of the 'links' dictionary.
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Tue, 09 Nov 2010 13:05:16 +0100
parents b37c401b7f92
children
comparison
equal deleted inserted replaced
740:c8c438b010aa 741:b3128fec5d54
70 Node-kind: file 70 Node-kind: file
71 Node-action: add 71 Node-action: add
72 Prop-content-length: 10 72 Prop-content-length: 10
73 Text-content-length: 2 73 Text-content-length: 2
74 Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3 74 Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3
75 Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b
75 Content-length: 12 76 Content-length: 12
76 77
77 PROPS-END 78 PROPS-END
78 a 79 a
79 80
91 Node-kind: file 92 Node-kind: file
92 Node-action: add 93 Node-action: add
93 Prop-content-length: 33 94 Prop-content-length: 33
94 Text-content-length: 6 95 Text-content-length: 6
95 Text-content-md5: c118dba188202a1efc975bef6064180b 96 Text-content-md5: c118dba188202a1efc975bef6064180b
97 Text-content-sha1: 41f94e4692313bf7f7c92aa600002f1dff93d6bf
96 Content-length: 39 98 Content-length: 39
97 99
98 K 11 100 K 11
99 svn:special 101 svn:special
100 V 1 102 V 1
106 Node-kind: file 108 Node-kind: file
107 Node-action: add 109 Node-action: add
108 Prop-content-length: 33 110 Prop-content-length: 33
109 Text-content-length: 6 111 Text-content-length: 6
110 Text-content-md5: c118dba188202a1efc975bef6064180b 112 Text-content-md5: c118dba188202a1efc975bef6064180b
113 Text-content-sha1: 41f94e4692313bf7f7c92aa600002f1dff93d6bf
111 Content-length: 39 114 Content-length: 39
112 115
113 K 11 116 K 11
114 svn:special 117 svn:special
115 V 1 118 V 1
121 Node-kind: file 124 Node-kind: file
122 Node-action: add 125 Node-action: add
123 Prop-content-length: 33 126 Prop-content-length: 33
124 Text-content-length: 6 127 Text-content-length: 6
125 Text-content-md5: c118dba188202a1efc975bef6064180b 128 Text-content-md5: c118dba188202a1efc975bef6064180b
129 Text-content-sha1: 41f94e4692313bf7f7c92aa600002f1dff93d6bf
126 Content-length: 39 130 Content-length: 39
127 131
128 K 11 132 K 11
129 svn:special 133 svn:special
130 V 1 134 V 1
169 Node-kind: file 173 Node-kind: file
170 Node-action: add 174 Node-action: add
171 Node-copyfrom-rev: 2 175 Node-copyfrom-rev: 2
172 Node-copyfrom-path: trunk/linka 176 Node-copyfrom-path: trunk/linka
173 Text-copy-source-md5: c118dba188202a1efc975bef6064180b 177 Text-copy-source-md5: c118dba188202a1efc975bef6064180b
178 Text-copy-source-sha1: 41f94e4692313bf7f7c92aa600002f1dff93d6bf
174 Prop-content-length: 57 179 Prop-content-length: 57
175 Content-length: 57 180 Content-length: 57
176 181
177 K 11 182 K 11
178 svn:special 183 svn:special
214 Node-path: trunk/d2/linka 219 Node-path: trunk/d2/linka
215 Node-kind: file 220 Node-kind: file
216 Node-action: change 221 Node-action: change
217 Text-content-length: 6 222 Text-content-length: 6
218 Text-content-md5: e9292b8c4fca95ac8c70b4ae040d0b79 223 Text-content-md5: e9292b8c4fca95ac8c70b4ae040d0b79
224 Text-content-sha1: 7325442a5f7383205e66db563025d51535883784
219 Content-length: 6 225 Content-length: 6
220 226
221 link b 227 link b
222 228
223 Node-path: trunk/linkaa 229 Node-path: trunk/linkaa
224 Node-kind: file 230 Node-kind: file
225 Node-action: change 231 Node-action: change
226 Text-content-length: 6 232 Text-content-length: 6
227 Text-content-md5: e9292b8c4fca95ac8c70b4ae040d0b79 233 Text-content-md5: e9292b8c4fca95ac8c70b4ae040d0b79
234 Text-content-sha1: 7325442a5f7383205e66db563025d51535883784
228 Content-length: 6 235 Content-length: 6
229 236
230 link b 237 link b
231 238
232 Revision-number: 5 239 Revision-number: 5
255 Node-kind: file 262 Node-kind: file
256 Node-action: replace 263 Node-action: replace
257 Prop-content-length: 10 264 Prop-content-length: 10
258 Text-content-length: 6 265 Text-content-length: 6
259 Text-content-md5: edc3d3797971f12c7f5e1d106dd5cee2 266 Text-content-md5: edc3d3797971f12c7f5e1d106dd5cee2
267 Text-content-sha1: eff1098d818d1f471af4a2cbdb0223e4e030a158
260 Content-length: 16 268 Content-length: 16
261 269
262 PROPS-END 270 PROPS-END
263 data2 271 data2
264 272
267 Node-kind: file 275 Node-kind: file
268 Node-action: change 276 Node-action: change
269 Prop-content-length: 34 277 Prop-content-length: 34
270 Text-content-length: 5 278 Text-content-length: 5
271 Text-content-md5: 6137cde4893c59f76f005a8123d8e8e6 279 Text-content-md5: 6137cde4893c59f76f005a8123d8e8e6
280 Text-content-sha1: c5d84736ba451747dd5f0eb9d17e104f3697ef47
272 Content-length: 39 281 Content-length: 39
273 282
274 K 13 283 K 13
275 svn:mergeinfo 284 svn:mergeinfo
276 V 0 285 V 0
277 286
278 PROPS-END 287 PROPS-END
279 data 288 data
280 289
281 290
291 Revision-number: 6
292 Prop-content-length: 116
293 Content-length: 116
294
295 K 7
296 svn:log
297 V 15
298 recreate a link
299 K 10
300 svn:author
301 V 6
302 danchr
303 K 8
304 svn:date
305 V 27
306 2010-11-08T14:57:19.667088Z
307 PROPS-END
308
309 Node-path: trunk/linka3
310 Node-kind: file
311 Node-action: add
312 Prop-content-length: 59
313 Text-content-length: 6
314 Text-content-md5: c118dba188202a1efc975bef6064180b
315 Text-content-sha1: 41f94e4692313bf7f7c92aa600002f1dff93d6bf
316 Content-length: 65
317
318 K 11
319 svn:special
320 V 1
321 *
322 K 14
323 svn:needs-lock
324 V 1
325 *
326 PROPS-END
327 link a
328
329 Revision-number: 7
330 Prop-content-length: 128
331 Content-length: 128
332
333 K 7
334 svn:log
335 V 27
336 delete property from a link
337 K 10
338 svn:author
339 V 6
340 danchr
341 K 8
342 svn:date
343 V 27
344 2010-11-08T14:57:40.331635Z
345 PROPS-END
346
347 Node-path: trunk/linka3
348 Node-kind: file
349 Node-action: change
350 Prop-content-length: 33
351 Content-length: 33
352
353 K 11
354 svn:special
355 V 1
356 *
357 PROPS-END
358
359
360 Revision-number: 8
361 Prop-content-length: 145
362 Content-length: 145
363
364 K 7
365 svn:log
366 V 44
367 add an uglily named file and a symlink to it
368 K 10
369 svn:author
370 V 6
371 danchr
372 K 8
373 svn:date
374 V 27
375 2010-11-08T15:11:12.267958Z
376 PROPS-END
377
378 Node-path: trunk/link to this
379 Node-kind: file
380 Node-action: add
381 Prop-content-length: 10
382 Text-content-length: 0
383 Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
384 Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
385 Content-length: 10
386
387 PROPS-END
388
389
390 Node-path: trunk/linka4
391 Node-kind: file
392 Node-action: add
393 Prop-content-length: 33
394 Text-content-length: 17
395 Text-content-md5: aecd1324085a1fc5b7aa8950f92dcfb9
396 Text-content-sha1: d22de0907c0b1878b057c873092e82fd9c50849b
397 Content-length: 50
398
399 K 11
400 svn:special
401 V 1
402 *
403 PROPS-END
404 link link to this
405