Mercurial > hg

comparison tests/test-mv-cp-st-diff.out @ 6282:709652cd7bff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-mv-cp-st-diff: avoid linkrev collisions The copy detection code relies heavily on the linkrevs, so it's better to avoid collisions in this test.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 15 Mar 2008 22:03:18 -0300
parents 81e7112b07ae
children 90a4329a6b4a
comparison
equal deleted inserted replaced
6281:3e5f99b13998 6282:709652cd7bff
17 diff --git a/a b/b 17 diff --git a/a b/b
18 rename from a 18 rename from a
19 rename to b 19 rename to b
20 --- a/a 20 --- a/a
21 +++ b/b 21 +++ b/b
22 @@ -1,1 +1,3 @@ 22 @@ -1,1 +1,4 @@
23 a 23 a
24 +0
24 +a1 25 +a1
25 +a2 26 +a2
26 27
27 - working to branch: --rev 2 28 - working to branch: --rev 2
28 A b 29 A b
32 diff --git a/a b/b 33 diff --git a/a b/b
33 rename from a 34 rename from a
34 rename to b 35 rename to b
35 --- a/a 36 --- a/a
36 +++ b/b 37 +++ b/b
37 @@ -1,3 +1,3 @@ 38 @@ -1,3 +1,4 @@
38 a 39 a
39 -m1 40 -m1
40 -m2 41 -m2
42 +0
41 +a1 43 +a1
42 +a2 44 +a2
43 45
44 - root to parent: --rev 0 --rev . 46 - root to parent: --rev 0 --rev .
45 M a 47 M a
46 48
47 diff --git a/a b/a 49 diff --git a/a b/a
48 --- a/a 50 --- a/a
49 +++ b/a 51 +++ b/a
50 @@ -1,1 +1,3 @@ 52 @@ -1,1 +1,4 @@
51 a 53 a
54 +0
52 +a1 55 +a1
53 +a2 56 +a2
54 57
55 - parent to root: --rev . --rev 0 58 - parent to root: --rev . --rev 0
56 M a 59 M a
57 60
58 diff --git a/a b/a 61 diff --git a/a b/a
59 --- a/a 62 --- a/a
60 +++ b/a 63 +++ b/a
61 @@ -1,3 +1,1 @@ 64 @@ -1,4 +1,1 @@
62 a 65 a
66 -0
63 -a1 67 -a1
64 -a2 68 -a2
65 69
66 - branch to parent: --rev 2 --rev . 70 - branch to parent: --rev 2 --rev .
67 M a 71 M a
68 72
69 diff --git a/a b/a 73 diff --git a/a b/a
70 --- a/a 74 --- a/a
71 +++ b/a 75 +++ b/a
72 @@ -1,3 +1,3 @@ 76 @@ -1,3 +1,4 @@
73 a 77 a
74 -m1 78 -m1
75 -m2 79 -m2
80 +0
76 +a1 81 +a1
77 +a2 82 +a2
78 83
79 - parent to branch: --rev . --rev 2 84 - parent to branch: --rev . --rev 2
80 M a 85 M a
81 86
82 diff --git a/a b/a 87 diff --git a/a b/a
83 --- a/a 88 --- a/a
84 +++ b/a 89 +++ b/a
85 @@ -1,3 +1,3 @@ 90 @@ -1,4 +1,3 @@
86 a 91 a
92 -0
87 -a1 93 -a1
88 -a2 94 -a2
89 +m1 95 +m1
90 +m2 96 +m2
91 97
106 a 112 a
107 113
108 diff --git a/a b/a 114 diff --git a/a b/a
109 --- a/a 115 --- a/a
110 +++ b/a 116 +++ b/a
111 @@ -1,1 +1,3 @@ 117 @@ -1,1 +1,4 @@
112 a 118 a
113 +a1 119 +1
114 +a2 120 +a1
115 diff --git a/a b/b 121 +a2
116 copy from a 122 diff --git a/a b/b
117 copy to b 123 copy from a
118 --- a/a 124 copy to b
119 +++ b/b 125 --- a/a
120 @@ -1,1 +1,3 @@ 126 +++ b/b
121 a 127 @@ -1,1 +1,4 @@
128 a
129 +1
122 +a1 130 +a1
123 +a2 131 +a2
124 132
125 - working to branch: --rev 2 133 - working to branch: --rev 2
126 M a 134 M a
128 a 136 a
129 137
130 diff --git a/a b/a 138 diff --git a/a b/a
131 --- a/a 139 --- a/a
132 +++ b/a 140 +++ b/a
133 @@ -1,3 +1,3 @@ 141 @@ -1,3 +1,4 @@
134 a 142 a
135 -m1 143 -m1
136 -m2 144 -m2
137 +a1 145 +1
138 +a2 146 +a1
139 diff --git a/a b/b 147 +a2
140 copy from a 148 diff --git a/a b/b
141 copy to b 149 copy from a
142 --- a/a 150 copy to b
143 +++ b/b 151 --- a/a
144 @@ -1,3 +1,3 @@ 152 +++ b/b
145 a 153 @@ -1,3 +1,4 @@
146 -m1 154 a
147 -m2 155 -m1
156 -m2
157 +1
148 +a1 158 +a1
149 +a2 159 +a2
150 160
151 - root to parent: --rev 0 --rev . 161 - root to parent: --rev 0 --rev .
152 M a 162 M a
153 163
154 diff --git a/a b/a 164 diff --git a/a b/a
155 --- a/a 165 --- a/a
156 +++ b/a 166 +++ b/a
157 @@ -1,1 +1,3 @@ 167 @@ -1,1 +1,4 @@
158 a 168 a
169 +1
159 +a1 170 +a1
160 +a2 171 +a2
161 172
162 - parent to root: --rev . --rev 0 173 - parent to root: --rev . --rev 0
163 M a 174 M a
164 175
165 diff --git a/a b/a 176 diff --git a/a b/a
166 --- a/a 177 --- a/a
167 +++ b/a 178 +++ b/a
168 @@ -1,3 +1,1 @@ 179 @@ -1,4 +1,1 @@
169 a 180 a
181 -1
170 -a1 182 -a1
171 -a2 183 -a2
172 184
173 - branch to parent: --rev 2 --rev . 185 - branch to parent: --rev 2 --rev .
174 M a 186 M a
175 187
176 diff --git a/a b/a 188 diff --git a/a b/a
177 --- a/a 189 --- a/a
178 +++ b/a 190 +++ b/a
179 @@ -1,3 +1,3 @@ 191 @@ -1,3 +1,4 @@
180 a 192 a
181 -m1 193 -m1
182 -m2 194 -m2
195 +1
183 +a1 196 +a1
184 +a2 197 +a2
185 198
186 - parent to branch: --rev . --rev 2 199 - parent to branch: --rev . --rev 2
187 M a 200 M a
188 201
189 diff --git a/a b/a 202 diff --git a/a b/a
190 --- a/a 203 --- a/a
191 +++ b/a 204 +++ b/a
192 @@ -1,3 +1,3 @@ 205 @@ -1,4 +1,3 @@
193 a 206 a
207 -1
194 -a1 208 -a1
195 -a2 209 -a2
196 +m1 210 +m1
197 +m2 211 +m2
198 212
203 M b 217 M b
204 218
205 diff --git a/b b/b 219 diff --git a/b b/b
206 --- a/b 220 --- a/b
207 +++ b/b 221 +++ b/b
208 @@ -1,2 +1,3 @@ 222 @@ -1,3 +1,4 @@
209 a 223 a
224 2
210 b1 225 b1
211 +w 226 +w
212 227
213 - working to root: --rev 0 228 - working to root: --rev 0
214 A b 229 A b
218 diff --git a/a b/b 233 diff --git a/a b/b
219 rename from a 234 rename from a
220 rename to b 235 rename to b
221 --- a/a 236 --- a/a
222 +++ b/b 237 +++ b/b
223 @@ -1,1 +1,3 @@ 238 @@ -1,1 +1,4 @@
224 a 239 a
240 +2
225 +b1 241 +b1
226 +w 242 +w
227 243
228 - working to branch: --rev 2 244 - working to branch: --rev 2
229 A b 245 A b
233 diff --git a/a b/b 249 diff --git a/a b/b
234 rename from a 250 rename from a
235 rename to b 251 rename to b
236 --- a/a 252 --- a/a
237 +++ b/b 253 +++ b/b
238 @@ -1,3 +1,3 @@ 254 @@ -1,3 +1,4 @@
239 a 255 a
240 -m1 256 -m1
241 -m2 257 -m2
258 +2
242 +b1 259 +b1
243 +w 260 +w
244 261
245 - root to parent: --rev 0 --rev . 262 - root to parent: --rev 0 --rev .
246 A b 263 A b
250 diff --git a/a b/b 267 diff --git a/a b/b
251 rename from a 268 rename from a
252 rename to b 269 rename to b
253 --- a/a 270 --- a/a
254 +++ b/b 271 +++ b/b
255 @@ -1,1 +1,2 @@ 272 @@ -1,1 +1,3 @@
256 a 273 a
274 +2
257 +b1 275 +b1
258 276
259 - parent to root: --rev . --rev 0 277 - parent to root: --rev . --rev 0
260 A a 278 A a
261 b 279 b
264 diff --git a/b b/a 282 diff --git a/b b/a
265 rename from b 283 rename from b
266 rename to a 284 rename to a
267 --- a/b 285 --- a/b
268 +++ b/a 286 +++ b/a
269 @@ -1,2 +1,1 @@ 287 @@ -1,3 +1,1 @@
270 a 288 a
289 -2
271 -b1 290 -b1
272 291
273 - branch to parent: --rev 2 --rev . 292 - branch to parent: --rev 2 --rev .
274 A b 293 A b
275 a 294 a
278 diff --git a/a b/b 297 diff --git a/a b/b
279 rename from a 298 rename from a
280 rename to b 299 rename to b
281 --- a/a 300 --- a/a
282 +++ b/b 301 +++ b/b
283 @@ -1,3 +1,2 @@ 302 @@ -1,3 +1,3 @@
284 a 303 a
285 -m1 304 -m1
286 -m2 305 -m2
306 +2
287 +b1 307 +b1
288 308
289 - parent to branch: --rev . --rev 2 309 - parent to branch: --rev . --rev 2
290 A a 310 A a
291 b 311 b
294 diff --git a/b b/a 314 diff --git a/b b/a
295 rename from b 315 rename from b
296 rename to a 316 rename to a
297 --- a/b 317 --- a/b
298 +++ b/a 318 +++ b/a
299 @@ -1,2 +1,3 @@ 319 @@ -1,3 +1,3 @@
300 a 320 a
321 -2
301 -b1 322 -b1
302 +m1 323 +m1
303 +m2 324 +m2
304 325
305 326
309 M a 330 M a
310 331
311 diff --git a/a b/a 332 diff --git a/a b/a
312 --- a/a 333 --- a/a
313 +++ b/a 334 +++ b/a
314 @@ -1,1 +1,2 @@ 335 @@ -1,2 +1,3 @@
315 a 336 a
337 3
316 +w 338 +w
317 339
318 - working to root: --rev 0 340 - working to root: --rev 0
319 M a 341 M a
320 A b 342 A b
321 a 343 a
322 344
323 diff --git a/a b/a 345 diff --git a/a b/a
324 --- a/a 346 --- a/a
325 +++ b/a 347 +++ b/a
326 @@ -1,1 +1,2 @@ 348 @@ -1,1 +1,3 @@
327 a 349 a
350 +3
328 +w 351 +w
329 diff --git a/a b/b 352 diff --git a/a b/b
330 copy from a 353 copy from a
331 copy to b 354 copy to b
332 --- a/a 355 --- a/a
333 +++ b/b 356 +++ b/b
334 @@ -1,1 +1,2 @@ 357 @@ -1,1 +1,3 @@
335 a 358 a
359 +3
336 +b1 360 +b1
337 361
338 - working to branch: --rev 2 362 - working to branch: --rev 2
339 M a 363 M a
340 A b 364 A b
341 a 365 a
342 366
343 diff --git a/a b/a 367 diff --git a/a b/a
344 --- a/a 368 --- a/a
345 +++ b/a 369 +++ b/a
346 @@ -1,3 +1,2 @@ 370 @@ -1,3 +1,3 @@
347 a 371 a
348 -m1 372 -m1
349 -m2 373 -m2
374 +3
350 +w 375 +w
351 diff --git a/a b/b 376 diff --git a/a b/b
352 copy from a 377 copy from a
353 copy to b 378 copy to b
354 --- a/a 379 --- a/a
355 +++ b/b 380 +++ b/b
356 @@ -1,3 +1,2 @@ 381 @@ -1,3 +1,3 @@
357 a 382 a
358 -m1 383 -m1
359 -m2 384 -m2
385 +3
360 +b1 386 +b1
361 387
362 - root to parent: --rev 0 --rev . 388 - root to parent: --rev 0 --rev .
363 A b 389 M a
364 a 390 A b
365 391 a
366 diff --git a/a b/b 392
367 copy from a 393 diff --git a/a b/a
368 copy to b 394 --- a/a
369 --- a/a 395 +++ b/a
370 +++ b/b 396 @@ -1,1 +1,2 @@
371 @@ -1,1 +1,2 @@ 397 a
372 a 398 +3
399 diff --git a/a b/b
400 copy from a
401 copy to b
402 --- a/a
403 +++ b/b
404 @@ -1,1 +1,3 @@
405 a
406 +3
373 +b1 407 +b1
374 408
375 - parent to root: --rev . --rev 0 409 - parent to root: --rev . --rev 0
410 M a
376 R b 411 R b
377 412
413 diff --git a/a b/a
414 --- a/a
415 +++ b/a
416 @@ -1,2 +1,1 @@
417 a
418 -3
419 diff --git a/b b/b
420 deleted file mode 100644
421 --- a/b
422 +++ /dev/null
423 @@ -1,3 +0,0 @@
424 -a
425 -3
426 -b1
427
428 - branch to parent: --rev 2 --rev .
429 M a
430 A b
431 a
432
433 diff --git a/a b/a
434 --- a/a
435 +++ b/a
436 @@ -1,3 +1,2 @@
437 a
438 -m1
439 -m2
440 +3
441 diff --git a/a b/b
442 copy from a
443 copy to b
444 --- a/a
445 +++ b/b
446 @@ -1,3 +1,3 @@
447 a
448 -m1
449 -m2
450 +3
451 +b1
452
453 - parent to branch: --rev . --rev 2
454 M a
455 R b
456
457 diff --git a/a b/a
458 --- a/a
459 +++ b/a
460 @@ -1,2 +1,3 @@
461 a
462 -3
463 +m1
464 +m2
465 diff --git a/b b/b
466 deleted file mode 100644
467 --- a/b
468 +++ /dev/null
469 @@ -1,3 +0,0 @@
470 -a
471 -3
472 -b1
473
474
475 ** rename chain **
476 ** hg mv a b / hg mv b c / hg mv c d
477 - working to parent:
478 A d
479 c
480 R c
481
482 diff --git a/c b/d
483 rename from c
484 rename to d
485
486 - working to root: --rev 0
487 A d
488 a
489 R a
490
491 diff --git a/a b/d
492 rename from a
493 rename to d
494 --- a/a
495 +++ b/d
496 @@ -1,1 +1,2 @@
497 a
498 +4
499
500 - working to branch: --rev 2
501 A d
502 a
503 R a
504
505 diff --git a/a b/d
506 rename from a
507 rename to d
508 --- a/a
509 +++ b/d
510 @@ -1,3 +1,2 @@
511 a
512 -m1
513 -m2
514 +4
515
516 - root to parent: --rev 0 --rev .
517 A c
518 a
519 R a
520
521 diff --git a/a b/c
522 rename from a
523 rename to c
524 --- a/a
525 +++ b/c
526 @@ -1,1 +1,2 @@
527 a
528 +4
529
530 - parent to root: --rev . --rev 0
531 A a
532 c
533 R c
534
535 diff --git a/c b/a
536 rename from c
537 rename to a
538 --- a/c
539 +++ b/a
540 @@ -1,2 +1,1 @@
541 a
542 -4
543
544 - branch to parent: --rev 2 --rev .
545 A c
546 a
547 R a
548
549 diff --git a/a b/c
550 rename from a
551 rename to c
552 --- a/a
553 +++ b/c
554 @@ -1,3 +1,2 @@
555 a
556 -m1
557 -m2
558 +4
559
560 - parent to branch: --rev . --rev 2
561 A a
562 c
563 R c
564
565 diff --git a/c b/a
566 rename from c
567 rename to a
568 --- a/c
569 +++ b/a
570 @@ -1,2 +1,3 @@
571 a
572 -4
573 +m1
574 +m2
575
576
577 ** copy chain **
578 ** hg cp a b / hg cp b c / hg cp c d
579 - working to parent:
580 A d
581 c
582
583 diff --git a/c b/d
584 copy from c
585 copy to d
586
587 - working to root: --rev 0
588 M a
589 A b
590 a
591 A c
592 a
593 A d
594 a
595
596 diff --git a/a b/a
597 --- a/a
598 +++ b/a
599 @@ -1,1 +1,2 @@
600 a
601 +5
602 diff --git a/a b/b
603 copy from a
604 copy to b
605 --- a/a
606 +++ b/b
607 @@ -1,1 +1,2 @@
608 a
609 +5
610 diff --git a/a b/c
611 copy from a
612 copy to c
613 --- a/a
614 +++ b/c
615 @@ -1,1 +1,2 @@
616 a
617 +5
618 diff --git a/a b/d
619 copy from a
620 copy to d
621 --- a/a
622 +++ b/d
623 @@ -1,1 +1,2 @@
624 a
625 +5
626
627 - working to branch: --rev 2
628 M a
629 A b
630 a
631 A c
632 a
633 A d
634 a
635
636 diff --git a/a b/a
637 --- a/a
638 +++ b/a
639 @@ -1,3 +1,2 @@
640 a
641 -m1
642 -m2
643 +5
644 diff --git a/a b/b
645 copy from a
646 copy to b
647 --- a/a
648 +++ b/b
649 @@ -1,3 +1,2 @@
650 a
651 -m1
652 -m2
653 +5
654 diff --git a/a b/c
655 copy from a
656 copy to c
657 --- a/a
658 +++ b/c
659 @@ -1,3 +1,2 @@
660 a
661 -m1
662 -m2
663 +5
664 diff --git a/a b/d
665 copy from a
666 copy to d
667 --- a/a
668 +++ b/d
669 @@ -1,3 +1,2 @@
670 a
671 -m1
672 -m2
673 +5
674
675 - root to parent: --rev 0 --rev .
676 M a
677 A b
678 a
679 A c
680 a
681
682 diff --git a/a b/a
683 --- a/a
684 +++ b/a
685 @@ -1,1 +1,2 @@
686 a
687 +5
688 diff --git a/a b/b
689 copy from a
690 copy to b
691 --- a/a
692 +++ b/b
693 @@ -1,1 +1,2 @@
694 a
695 +5
696 diff --git a/a b/c
697 copy from a
698 copy to c
699 --- a/a
700 +++ b/c
701 @@ -1,1 +1,2 @@
702 a
703 +5
704
705 - parent to root: --rev . --rev 0
706 M a
707 R b
708 R c
709
710 diff --git a/a b/a
711 --- a/a
712 +++ b/a
713 @@ -1,2 +1,1 @@
714 a
715 -5
378 diff --git a/b b/b 716 diff --git a/b b/b
379 deleted file mode 100644 717 deleted file mode 100644
380 --- a/b 718 --- a/b
381 +++ /dev/null 719 +++ /dev/null
382 @@ -1,2 +0,0 @@ 720 @@ -1,2 +0,0 @@
383 -a 721 -a
384 -b1 722 -5
723 diff --git a/c b/c
724 deleted file mode 100644
725 --- a/c
726 +++ /dev/null
727 @@ -1,2 +0,0 @@
728 -a
729 -5
385 730
386 - branch to parent: --rev 2 --rev . 731 - branch to parent: --rev 2 --rev .
387 M a 732 M a
388 A b 733 A b
389 a 734 a
390 735 A c
391 diff --git a/a b/a 736 a
392 --- a/a 737
393 +++ b/a 738 diff --git a/a b/a
394 @@ -1,3 +1,1 @@ 739 --- a/a
395 a 740 +++ b/a
396 -m1 741 @@ -1,3 +1,2 @@
397 -m2 742 a
398 diff --git a/a b/b 743 -m1
399 copy from a 744 -m2
400 copy to b 745 +5
401 --- a/a 746 diff --git a/a b/b
402 +++ b/b 747 copy from a
403 @@ -1,3 +1,2 @@ 748 copy to b
404 a 749 --- a/a
405 -m1 750 +++ b/b
406 -m2 751 @@ -1,3 +1,2 @@
407 +b1 752 a
753 -m1
754 -m2
755 +5
756 diff --git a/a b/c
757 copy from a
758 copy to c
759 --- a/a
760 +++ b/c
761 @@ -1,3 +1,2 @@
762 a
763 -m1
764 -m2
765 +5
408 766
409 - parent to branch: --rev . --rev 2 767 - parent to branch: --rev . --rev 2
410 M a 768 M a
411 R b 769 R b
412 770 R c
413 diff --git a/a b/a 771
414 --- a/a 772 diff --git a/a b/a
415 +++ b/a 773 --- a/a
416 @@ -1,1 +1,3 @@ 774 +++ b/a
417 a 775 @@ -1,2 +1,3 @@
776 a
777 -5
418 +m1 778 +m1
419 +m2 779 +m2
420 diff --git a/b b/b 780 diff --git a/b b/b
421 deleted file mode 100644 781 deleted file mode 100644
422 --- a/b 782 --- a/b
423 +++ /dev/null 783 +++ /dev/null
424 @@ -1,2 +0,0 @@ 784 @@ -1,2 +0,0 @@
425 -a 785 -a
426 -b1 786 -5
427
428
429 ** rename chain **
430 ** hg mv a b / hg mv b c / hg mv c d
431 - working to parent:
432 A d
433 c
434 R c
435
436 diff --git a/c b/d
437 rename from c
438 rename to d
439
440 - working to root: --rev 0
441 A d
442 a
443 R a
444
445 diff --git a/a b/d
446 rename from a
447 rename to d
448
449 - working to branch: --rev 2
450 A d
451 a
452 R a
453
454 diff --git a/a b/d
455 rename from a
456 rename to d
457 --- a/a
458 +++ b/d
459 @@ -1,3 +1,1 @@
460 a
461 -m1
462 -m2
463
464 - root to parent: --rev 0 --rev .
465 A c
466 a
467 R a
468
469 diff --git a/a b/c
470 rename from a
471 rename to c
472
473 - parent to root: --rev . --rev 0
474 A a
475 c
476 R c
477
478 diff --git a/c b/a
479 rename from c
480 rename to a
481
482 - branch to parent: --rev 2 --rev .
483 A c
484 a
485 R a
486
487 diff --git a/a b/c
488 rename from a
489 rename to c
490 --- a/a
491 +++ b/c
492 @@ -1,3 +1,1 @@
493 a
494 -m1
495 -m2
496
497 - parent to branch: --rev . --rev 2
498 A a
499 c
500 R c
501
502 diff --git a/c b/a
503 rename from c
504 rename to a
505 --- a/c
506 +++ b/a
507 @@ -1,1 +1,3 @@
508 a
509 +m1
510 +m2
511
512
513 ** copy chain **
514 ** hg cp a b / hg cp b c / hg cp c d
515 - working to parent:
516 A d
517 c
518
519 diff --git a/c b/d
520 copy from c
521 copy to d
522
523 - working to root: --rev 0
524 A b
525 a
526 A c
527 a
528 A d
529 a
530
531 diff --git a/a b/b
532 copy from a
533 copy to b
534 diff --git a/a b/c
535 copy from a
536 copy to c
537 diff --git a/a b/d
538 copy from a
539 copy to d
540
541 - working to branch: --rev 2
542 M a
543 A b
544 a
545 A c
546 a
547 A d
548 a
549
550 diff --git a/a b/a
551 --- a/a
552 +++ b/a
553 @@ -1,3 +1,1 @@
554 a
555 -m1
556 -m2
557 diff --git a/a b/b
558 copy from a
559 copy to b
560 --- a/a
561 +++ b/b
562 @@ -1,3 +1,1 @@
563 a
564 -m1
565 -m2
566 diff --git a/a b/c
567 copy from a
568 copy to c
569 --- a/a
570 +++ b/c
571 @@ -1,3 +1,1 @@
572 a
573 -m1
574 -m2
575 diff --git a/a b/d
576 copy from a
577 copy to d
578 --- a/a
579 +++ b/d
580 @@ -1,3 +1,1 @@
581 a
582 -m1
583 -m2
584
585 - root to parent: --rev 0 --rev .
586 A b
587 a
588 A c
589 a
590
591 diff --git a/a b/b
592 copy from a
593 copy to b
594 diff --git a/a b/c
595 copy from a
596 copy to c
597
598 - parent to root: --rev . --rev 0
599 R b
600 R c
601
602 diff --git a/b b/b
603 deleted file mode 100644
604 --- a/b
605 +++ /dev/null
606 @@ -1,1 +0,0 @@
607 -a
608 diff --git a/c b/c 787 diff --git a/c b/c
609 deleted file mode 100644 788 deleted file mode 100644
610 --- a/c 789 --- a/c
611 +++ /dev/null 790 +++ /dev/null
612 @@ -1,1 +0,0 @@ 791 @@ -1,2 +0,0 @@
613 -a 792 -a
614 793 -5
615 - branch to parent: --rev 2 --rev . 794
616 M a 795
617 A b
618 a
619 A c
620 a
621
622 diff --git a/a b/a
623 --- a/a
624 +++ b/a
625 @@ -1,3 +1,1 @@
626 a
627 -m1
628 -m2
629 diff --git a/a b/b
630 copy from a
631 copy to b
632 --- a/a
633 +++ b/b
634 @@ -1,3 +1,1 @@
635 a
636 -m1
637 -m2
638 diff --git a/a b/c
639 copy from a
640 copy to c
641 --- a/a
642 +++ b/c
643 @@ -1,3 +1,1 @@
644 a
645 -m1
646 -m2
647
648 - parent to branch: --rev . --rev 2
649 M a
650 R b
651 R c
652
653 diff --git a/a b/a
654 --- a/a
655 +++ b/a
656 @@ -1,1 +1,3 @@
657 a
658 +m1
659 +m2
660 diff --git a/b b/b
661 deleted file mode 100644
662 --- a/b
663 +++ /dev/null
664 @@ -1,1 +0,0 @@
665 -a
666 diff --git a/c b/c
667 deleted file mode 100644
668 --- a/c
669 +++ /dev/null
670 @@ -1,1 +0,0 @@
671 -a
672
673