Mercurial > hgsubversion

comparison tests/fixtures/renamedproject.svndump @ 313:942f198b8ff5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg_delta_editor: detect new branches issued from non-branch directories This fix solves the following case: let's /dumb/layout/project be an existing project. To normalize the trunk/branches/tags layout, people may do: $ mkdir /project $ mv /dumb/layout/project /project/project # Oups, should have been trunk! $ mv /project/project /project/trunk trunk creation was ignore because: - update_branch_map() sees it come from a non-branch copy source and ignores it (case #3). - since it is not in self.branches, add_directory() ignores the non-existing path. Then trunk is left uninitialized. To solve this, we allow update_branch_map() to detect branches copied from non-canonical locations.
author Patrick Mezard <pmezard@gmail.com>
date Sun, 03 May 2009 21:42:42 -0500
parents
children
comparison
equal deleted inserted replaced
312:4dc197f533c1 313:942f198b8ff5
1 SVN-fs-dump-format-version: 2
2
3 UUID: 169a5fe1-3c9f-4eef-ad86-f932c54e53dc
4
5 Revision-number: 0
6 Prop-content-length: 56
7 Content-length: 56
8
9 K 8
10 svn:date
11 V 27
12 2009-05-01T17:53:40.957980Z
13 PROPS-END
14
15 Revision-number: 1
16 Prop-content-length: 114
17 Content-length: 114
18
19 K 7
20 svn:log
21 V 12
22 init project
23 K 10
24 svn:author
25 V 7
26 pmezard
27 K 8
28 svn:date
29 V 27
30 2009-05-01T17:53:41.129010Z
31 PROPS-END
32
33 Node-path: project-orig
34 Node-kind: dir
35 Node-action: add
36 Prop-content-length: 10
37 Content-length: 10
38
39 PROPS-END
40
41
42 Node-path: project-orig/a
43 Node-kind: file
44 Node-action: add
45 Prop-content-length: 10
46 Text-content-length: 2
47 Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3
48 Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b
49 Content-length: 12
50
51 PROPS-END
52 a
53
54
55 Node-path: project-orig/b
56 Node-kind: file
57 Node-action: add
58 Prop-content-length: 10
59 Text-content-length: 2
60 Text-content-md5: 3b5d5c3712955042212316173ccf37be
61 Text-content-sha1: 89e6c98d92887913cadf06b2adb97f26cde4849b
62 Content-length: 12
63
64 PROPS-END
65 b
66
67
68 Node-path: project-orig/c
69 Node-kind: file
70 Node-action: add
71 Prop-content-length: 10
72 Text-content-length: 2
73 Text-content-md5: 2cd6ee2c70b0bde53fbe6cac3c8b8bb1
74 Text-content-sha1: 2b66fd261ee5c6cfc8de7fa466bab600bcfe4f69
75 Content-length: 12
76
77 PROPS-END
78 c
79
80
81 Node-path: project-orig/d
82 Node-kind: dir
83 Node-action: add
84 Prop-content-length: 10
85 Content-length: 10
86
87 PROPS-END
88
89
90 Node-path: project-orig/d/a
91 Node-kind: file
92 Node-action: add
93 Prop-content-length: 10
94 Text-content-length: 2
95 Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3
96 Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b
97 Content-length: 12
98
99 PROPS-END
100 a
101
102
103 Revision-number: 2
104 Prop-content-length: 113
105 Content-length: 113
106
107 K 7
108 svn:log
109 V 11
110 init branch
111 K 10
112 svn:author
113 V 7
114 pmezard
115 K 8
116 svn:date
117 V 27
118 2009-05-01T17:53:41.193926Z
119 PROPS-END
120
121 Node-path: project-branch
122 Node-kind: dir
123 Node-action: add
124 Prop-content-length: 10
125 Content-length: 10
126
127 PROPS-END
128
129
130 Node-path: project-branch/a
131 Node-kind: file
132 Node-action: add
133 Prop-content-length: 10
134 Text-content-length: 2
135 Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3
136 Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b
137 Content-length: 12
138
139 PROPS-END
140 a
141
142
143 Node-path: project-branch/b
144 Node-kind: file
145 Node-action: add
146 Prop-content-length: 10
147 Text-content-length: 2
148 Text-content-md5: 3b5d5c3712955042212316173ccf37be
149 Text-content-sha1: 89e6c98d92887913cadf06b2adb97f26cde4849b
150 Content-length: 12
151
152 PROPS-END
153 b
154
155
156 Revision-number: 3
157 Prop-content-length: 130
158 Content-length: 130
159
160 K 7
161 svn:log
162 V 28
163 create new project hierarchy
164 K 10
165 svn:author
166 V 7
167 pmezard
168 K 8
169 svn:date
170 V 27
171 2009-05-01T17:53:41.236131Z
172 PROPS-END
173
174 Node-path: project
175 Node-kind: dir
176 Node-action: add
177 Prop-content-length: 10
178 Content-length: 10
179
180 PROPS-END
181
182
183 Revision-number: 4
184 Prop-content-length: 119
185 Content-length: 119
186
187 K 7
188 svn:log
189 V 17
190 rename as project
191 K 10
192 svn:author
193 V 7
194 pmezard
195 K 8
196 svn:date
197 V 27
198 2009-05-01T17:53:41.288164Z
199 PROPS-END
200
201 Node-path: project/project
202 Node-kind: dir
203 Node-action: add
204 Node-copyfrom-rev: 3
205 Node-copyfrom-path: project-orig
206
207
208 Node-path: project-orig
209 Node-action: delete
210
211
212 Revision-number: 5
213 Prop-content-length: 119
214 Content-length: 119
215
216 K 7
217 svn:log
218 V 17
219 rename as project
220 K 10
221 svn:author
222 V 7
223 pmezard
224 K 8
225 svn:date
226 V 27
227 2009-05-01T17:53:41.335332Z
228 PROPS-END
229
230 Node-path: project/trunk
231 Node-kind: dir
232 Node-action: add
233 Node-copyfrom-rev: 4
234 Node-copyfrom-path: project/project
235
236
237 Node-path: project/project
238 Node-action: delete
239
240
241 Revision-number: 6
242 Prop-content-length: 119
243 Content-length: 119
244
245 K 7
246 svn:log
247 V 17
248 add branches root
249 K 10
250 svn:author
251 V 7
252 pmezard
253 K 8
254 svn:date
255 V 27
256 2009-05-01T17:53:41.377684Z
257 PROPS-END
258
259 Node-path: project/branches
260 Node-kind: dir
261 Node-action: add
262 Prop-content-length: 10
263 Content-length: 10
264
265 PROPS-END
266
267
268 Revision-number: 7
269 Prop-content-length: 130
270 Content-length: 130
271
272 K 7
273 svn:log
274 V 28
275 incorrect move of the branch
276 K 10
277 svn:author
278 V 7
279 pmezard
280 K 8
281 svn:date
282 V 27
283 2009-05-01T17:53:41.426928Z
284 PROPS-END
285
286 Node-path: project/misplaced
287 Node-kind: dir
288 Node-action: add
289 Node-copyfrom-rev: 6
290 Node-copyfrom-path: project-branch
291
292
293 Node-path: project-branch
294 Node-action: delete
295
296
297 Revision-number: 8
298 Prop-content-length: 120
299 Content-length: 120
300
301 K 7
302 svn:log
303 V 18
304 move of the branch
305 K 10
306 svn:author
307 V 7
308 pmezard
309 K 8
310 svn:date
311 V 27
312 2009-05-01T17:53:41.478644Z
313 PROPS-END
314
315 Node-path: project/branches/branch
316 Node-kind: dir
317 Node-action: add
318 Node-copyfrom-rev: 7
319 Node-copyfrom-path: project/misplaced
320
321
322 Node-path: project/misplaced
323 Node-action: delete
324
325
326 Revision-number: 9
327 Prop-content-length: 109
328 Content-length: 109
329
330 K 7
331 svn:log
332 V 8
333 change a
334 K 10
335 svn:author
336 V 7
337 pmezard
338 K 8
339 svn:date
340 V 27
341 2009-05-01T17:53:42.078428Z
342 PROPS-END
343
344 Node-path: project/trunk/a
345 Node-kind: file
346 Node-action: change
347 Text-content-length: 4
348 Text-content-md5: 0d227f1abf8c2932d342e9b99cc957eb
349 Text-content-sha1: d7c8127a20a396cff08af086a1c695b0636f0c29
350 Content-length: 4
351
352 a
353 a
354
355
356 Revision-number: 10
357 Prop-content-length: 123
358 Content-length: 123
359
360 K 7
361 svn:log
362 V 21
363 change files in trunk
364 K 10
365 svn:author
366 V 7
367 pmezard
368 K 8
369 svn:date
370 V 27
371 2009-05-01T17:53:43.109915Z
372 PROPS-END
373
374 Node-path: project/trunk/a
375 Node-kind: file
376 Node-action: change
377 Text-content-length: 6
378 Text-content-md5: 7d4ebf8f298d22fc349a91725b00af1c
379 Text-content-sha1: 92f31bc48f52339253fce6cad9f2f0c95b302f7e
380 Content-length: 6
381
382 a
383 a
384 a
385
386
387 Node-path: project/trunk/b
388 Node-kind: file
389 Node-action: change
390 Text-content-length: 4
391 Text-content-md5: 06ac26ed8b614fc0b141e4542aa067c2
392 Text-content-sha1: f6980469e74f7125178e88ec571e06fe6ce86e95
393 Content-length: 4
394
395 b
396 b
397
398
399 Node-path: project/trunk/d/a
400 Node-kind: file
401 Node-action: change
402 Text-content-length: 4
403 Text-content-md5: 0d227f1abf8c2932d342e9b99cc957eb
404 Text-content-sha1: d7c8127a20a396cff08af086a1c695b0636f0c29
405 Content-length: 4
406
407 a
408 a
409
410
411 Node-path: project/trunk/c
412 Node-action: delete
413
414
415 Revision-number: 11
416 Prop-content-length: 120
417 Content-length: 120
418
419 K 7
420 svn:log
421 V 18
422 change a in branch
423 K 10
424 svn:author
425 V 7
426 pmezard
427 K 8
428 svn:date
429 V 27
430 2009-05-01T17:53:44.100553Z
431 PROPS-END
432
433 Node-path: project/branches/branch/a
434 Node-kind: file
435 Node-action: change
436 Text-content-length: 4
437 Text-content-md5: 0d227f1abf8c2932d342e9b99cc957eb
438 Text-content-sha1: d7c8127a20a396cff08af086a1c695b0636f0c29
439 Content-length: 4
440
441 a
442 a
443
444
445 Node-path: project/branches/branch/b
446 Node-action: delete
447
448
449 Revision-number: 12
450 Prop-content-length: 134
451 Content-length: 134
452
453 K 7
454 svn:log
455 V 32
456 init fake trunk for rebuild_meta
457 K 10
458 svn:author
459 V 7
460 pmezard
461 K 8
462 svn:date
463 V 27
464 2009-05-01T17:53:45.089483Z
465 PROPS-END
466
467 Node-path: trunk
468 Node-kind: dir
469 Node-action: add
470 Prop-content-length: 10
471 Content-length: 10
472
473 PROPS-END
474
475
476 Node-path: trunk/a
477 Node-kind: file
478 Node-action: add
479 Prop-content-length: 10
480 Text-content-length: 2
481 Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3
482 Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b
483 Content-length: 12
484
485 PROPS-END
486 a
487
488
489 Node-path: trunk/b
490 Node-kind: file
491 Node-action: add
492 Prop-content-length: 10
493 Text-content-length: 2
494 Text-content-md5: 3b5d5c3712955042212316173ccf37be
495 Text-content-sha1: 89e6c98d92887913cadf06b2adb97f26cde4849b
496 Content-length: 12
497
498 PROPS-END
499 b
500
501
502 Node-path: trunk/c
503 Node-kind: file
504 Node-action: add
505 Prop-content-length: 10
506 Text-content-length: 2
507 Text-content-md5: 2cd6ee2c70b0bde53fbe6cac3c8b8bb1
508 Text-content-sha1: 2b66fd261ee5c6cfc8de7fa466bab600bcfe4f69
509 Content-length: 12
510
511 PROPS-END
512 c
513
514
515 Node-path: trunk/d
516 Node-kind: dir
517 Node-action: add
518 Prop-content-length: 10
519 Content-length: 10
520
521 PROPS-END
522
523
524 Node-path: trunk/d/a
525 Node-kind: file
526 Node-action: add
527 Prop-content-length: 10
528 Text-content-length: 2
529 Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3
530 Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b
531 Content-length: 12
532
533 PROPS-END
534 a
535
536