##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

test-mv-cp-st-diff: avoid linkrev collisions...
Alexis S. L. Carvalho -
r6282:709652cd default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -28,6 +28,7 b' show()'
28 echo
28 echo
29 }
29 }
30
30
31 count=0
31 # make a new branch and get diff/status output
32 # make a new branch and get diff/status output
32 # $1 - first commit
33 # $1 - first commit
33 # $2 - second commit
34 # $2 - second commit
@@ -37,6 +38,9 b' tb()'
37 {
38 {
38 hg co -q -C 0
39 hg co -q -C 0
39
40
41 add a $count
42 count=`expr $count + 1`
43 hg ci -m "t0"
40 $1
44 $1
41 hg ci -m "t1"
45 hg ci -m "t1"
42 $2
46 $2
Show file before | Show file after | Hide comments
@@ -19,8 +19,9 b' 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
@@ -34,10 +35,11 b' 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
@@ -47,8 +49,9 b' M a'
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
@@ -58,8 +61,9 b' M a'
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
@@ -69,10 +73,11 b' M a'
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
@@ -82,8 +87,9 b' M a'
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
@@ -108,8 +114,9 b' A b'
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
119 +1
113 +a1
120 +a1
114 +a2
121 +a2
115 diff --git a/a b/b
122 diff --git a/a b/b
@@ -117,8 +124,9 b' copy from a'
117 copy to b
124 copy to b
118 --- a/a
125 --- a/a
119 +++ b/b
126 +++ b/b
120 @@ -1,1 +1,3 @@
127 @@ -1,1 +1,4 @@
121 a
128 a
129 +1
122 +a1
130 +a1
123 +a2
131 +a2
124
132
@@ -130,10 +138,11 b' A b'
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
145 +1
137 +a1
146 +a1
138 +a2
147 +a2
139 diff --git a/a b/b
148 diff --git a/a b/b
@@ -141,10 +150,11 b' copy from a'
141 copy to b
150 copy to b
142 --- a/a
151 --- a/a
143 +++ b/b
152 +++ b/b
144 @@ -1,3 +1,3 @@
153 @@ -1,3 +1,4 @@
145 a
154 a
146 -m1
155 -m1
147 -m2
156 -m2
157 +1
148 +a1
158 +a1
149 +a2
159 +a2
150
160
@@ -154,8 +164,9 b' M a'
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
@@ -165,8 +176,9 b' M a'
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
@@ -176,10 +188,11 b' M a'
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
@@ -189,8 +202,9 b' M a'
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
@@ -205,8 +219,9 b' M b'
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
@@ -220,8 +235,9 b' 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
@@ -235,10 +251,11 b' 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
@@ -252,8 +269,9 b' 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
@@ -266,8 +284,9 b' 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 .
@@ -280,10 +299,11 b' 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
@@ -296,8 +316,9 b' 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
@@ -311,8 +332,9 b' M a'
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
@@ -323,19 +345,87 b' A b'
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 @@
349 a
350 +3
351 +w
352 diff --git a/a b/b
353 copy from a
354 copy to b
355 --- a/a
356 +++ b/b
357 @@ -1,1 +1,3 @@
327 a
358 a
359 +3
360 +b1
361
362 - working to branch: --rev 2
363 M a
364 A b
365 a
366
367 diff --git a/a b/a
368 --- a/a
369 +++ b/a
370 @@ -1,3 +1,3 @@
371 a
372 -m1
373 -m2
374 +3
328 +w
375 +w
329 diff --git a/a b/b
376 diff --git a/a b/b
330 copy from a
377 copy from a
331 copy to b
378 copy to b
332 --- a/a
379 --- a/a
333 +++ b/b
380 +++ b/b
381 @@ -1,3 +1,3 @@
382 a
383 -m1
384 -m2
385 +3
386 +b1
387
388 - root to parent: --rev 0 --rev .
389 M a
390 A b
391 a
392
393 diff --git a/a b/a
394 --- a/a
395 +++ b/a
334 @@ -1,1 +1,2 @@
396 @@ -1,1 +1,2 @@
335 a
397 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
336 +b1
407 +b1
337
408
338 - working to branch: --rev 2
409 - parent to root: --rev . --rev 0
410 M a
411 R b
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 .
339 M a
429 M a
340 A b
430 A b
341 a
431 a
@@ -347,63 +437,17 b' diff --git a/a b/a'
347 a
437 a
348 -m1
438 -m1
349 -m2
439 -m2
350 +w
440 +3
351 diff --git a/a b/b
352 copy from a
353 copy to b
354 --- a/a
355 +++ b/b
356 @@ -1,3 +1,2 @@
357 a
358 -m1
359 -m2
360 +b1
361
362 - root to parent: --rev 0 --rev .
363 A b
364 a
365
366 diff --git a/a b/b
441 diff --git a/a b/b
367 copy from a
442 copy from a
368 copy to b
443 copy to b
369 --- a/a
444 --- a/a
370 +++ b/b
445 +++ b/b
371 @@ -1,1 +1,2 @@
446 @@ -1,3 +1,3 @@
372 a
373 +b1
374
375 - parent to root: --rev . --rev 0
376 R b
377
378 diff --git a/b b/b
379 deleted file mode 100644
380 --- a/b
381 +++ /dev/null
382 @@ -1,2 +0,0 @@
383 -a
384 -b1
385
386 - branch to parent: --rev 2 --rev .
387 M a
388 A b
389 a
390
391 diff --git a/a b/a
392 --- a/a
393 +++ b/a
394 @@ -1,3 +1,1 @@
395 a
447 a
396 -m1
448 -m1
397 -m2
449 -m2
398 diff --git a/a b/b
450 +3
399 copy from a
400 copy to b
401 --- a/a
402 +++ b/b
403 @@ -1,3 +1,2 @@
404 a
405 -m1
406 -m2
407 +b1
451 +b1
408
452
409 - parent to branch: --rev . --rev 2
453 - parent to branch: --rev . --rev 2
@@ -413,16 +457,18 b' R b'
413 diff --git a/a b/a
457 diff --git a/a b/a
414 --- a/a
458 --- a/a
415 +++ b/a
459 +++ b/a
416 @@ -1,1 +1,3 @@
460 @@ -1,2 +1,3 @@
417 a
461 a
462 -3
418 +m1
463 +m1
419 +m2
464 +m2
420 diff --git a/b b/b
465 diff --git a/b b/b
421 deleted file mode 100644
466 deleted file mode 100644
422 --- a/b
467 --- a/b
423 +++ /dev/null
468 +++ /dev/null
424 @@ -1,2 +0,0 @@
469 @@ -1,3 +0,0 @@
425 -a
470 -a
471 -3
426 -b1
472 -b1
427
473
428
474
@@ -445,6 +491,11 b' R a'
445 diff --git a/a b/d
491 diff --git a/a b/d
446 rename from a
492 rename from a
447 rename to d
493 rename to d
494 --- a/a
495 +++ b/d
496 @@ -1,1 +1,2 @@
497 a
498 +4
448
499
449 - working to branch: --rev 2
500 - working to branch: --rev 2
450 A d
501 A d
@@ -456,10 +507,11 b' rename from a'
456 rename to d
507 rename to d
457 --- a/a
508 --- a/a
458 +++ b/d
509 +++ b/d
459 @@ -1,3 +1,1 @@
510 @@ -1,3 +1,2 @@
460 a
511 a
461 -m1
512 -m1
462 -m2
513 -m2
514 +4
463
515
464 - root to parent: --rev 0 --rev .
516 - root to parent: --rev 0 --rev .
465 A c
517 A c
@@ -469,6 +521,11 b' R a'
469 diff --git a/a b/c
521 diff --git a/a b/c
470 rename from a
522 rename from a
471 rename to c
523 rename to c
524 --- a/a
525 +++ b/c
526 @@ -1,1 +1,2 @@
527 a
528 +4
472
529
473 - parent to root: --rev . --rev 0
530 - parent to root: --rev . --rev 0
474 A a
531 A a
@@ -478,6 +535,11 b' R c'
478 diff --git a/c b/a
535 diff --git a/c b/a
479 rename from c
536 rename from c
480 rename to a
537 rename to a
538 --- a/c
539 +++ b/a
540 @@ -1,2 +1,1 @@
541 a
542 -4
481
543
482 - branch to parent: --rev 2 --rev .
544 - branch to parent: --rev 2 --rev .
483 A c
545 A c
@@ -489,10 +551,11 b' rename from a'
489 rename to c
551 rename to c
490 --- a/a
552 --- a/a
491 +++ b/c
553 +++ b/c
492 @@ -1,3 +1,1 @@
554 @@ -1,3 +1,2 @@
493 a
555 a
494 -m1
556 -m1
495 -m2
557 -m2
558 +4
496
559
497 - parent to branch: --rev . --rev 2
560 - parent to branch: --rev . --rev 2
498 A a
561 A a
@@ -504,8 +567,9 b' rename from c'
504 rename to a
567 rename to a
505 --- a/c
568 --- a/c
506 +++ b/a
569 +++ b/a
507 @@ -1,1 +1,3 @@
570 @@ -1,2 +1,3 @@
508 a
571 a
572 -4
509 +m1
573 +m1
510 +m2
574 +m2
511
575
@@ -521,6 +585,7 b' copy from c'
521 copy to d
585 copy to d
522
586
523 - working to root: --rev 0
587 - working to root: --rev 0
588 M a
524 A b
589 A b
525 a
590 a
526 A c
591 A c
@@ -528,15 +593,36 b' A c'
528 A d
593 A d
529 a
594 a
530
595
596 diff --git a/a b/a
597 --- a/a
598 +++ b/a
599 @@ -1,1 +1,2 @@
600 a
601 +5
531 diff --git a/a b/b
602 diff --git a/a b/b
532 copy from a
603 copy from a
533 copy to b
604 copy to b
605 --- a/a
606 +++ b/b
607 @@ -1,1 +1,2 @@
608 a
609 +5
534 diff --git a/a b/c
610 diff --git a/a b/c
535 copy from a
611 copy from a
536 copy to c
612 copy to c
613 --- a/a
614 +++ b/c
615 @@ -1,1 +1,2 @@
616 a
617 +5
537 diff --git a/a b/d
618 diff --git a/a b/d
538 copy from a
619 copy from a
539 copy to d
620 copy to d
621 --- a/a
622 +++ b/d
623 @@ -1,1 +1,2 @@
624 a
625 +5
540
626
541 - working to branch: --rev 2
627 - working to branch: --rev 2
542 M a
628 M a
@@ -550,67 +636,97 b' A d'
550 diff --git a/a b/a
636 diff --git a/a b/a
551 --- a/a
637 --- a/a
552 +++ b/a
638 +++ b/a
553 @@ -1,3 +1,1 @@
639 @@ -1,3 +1,2 @@
554 a
640 a
555 -m1
641 -m1
556 -m2
642 -m2
643 +5
557 diff --git a/a b/b
644 diff --git a/a b/b
558 copy from a
645 copy from a
559 copy to b
646 copy to b
560 --- a/a
647 --- a/a
561 +++ b/b
648 +++ b/b
562 @@ -1,3 +1,1 @@
649 @@ -1,3 +1,2 @@
563 a
650 a
564 -m1
651 -m1
565 -m2
652 -m2
653 +5
566 diff --git a/a b/c
654 diff --git a/a b/c
567 copy from a
655 copy from a
568 copy to c
656 copy to c
569 --- a/a
657 --- a/a
570 +++ b/c
658 +++ b/c
571 @@ -1,3 +1,1 @@
659 @@ -1,3 +1,2 @@
572 a
660 a
573 -m1
661 -m1
574 -m2
662 -m2
663 +5
575 diff --git a/a b/d
664 diff --git a/a b/d
576 copy from a
665 copy from a
577 copy to d
666 copy to d
578 --- a/a
667 --- a/a
579 +++ b/d
668 +++ b/d
580 @@ -1,3 +1,1 @@
669 @@ -1,3 +1,2 @@
581 a
670 a
582 -m1
671 -m1
583 -m2
672 -m2
673 +5
584
674
585 - root to parent: --rev 0 --rev .
675 - root to parent: --rev 0 --rev .
676 M a
586 A b
677 A b
587 a
678 a
588 A c
679 A c
589 a
680 a
590
681
682 diff --git a/a b/a
683 --- a/a
684 +++ b/a
685 @@ -1,1 +1,2 @@
686 a
687 +5
591 diff --git a/a b/b
688 diff --git a/a b/b
592 copy from a
689 copy from a
593 copy to b
690 copy to b
691 --- a/a
692 +++ b/b
693 @@ -1,1 +1,2 @@
694 a
695 +5
594 diff --git a/a b/c
696 diff --git a/a b/c
595 copy from a
697 copy from a
596 copy to c
698 copy to c
699 --- a/a
700 +++ b/c
701 @@ -1,1 +1,2 @@
702 a
703 +5
597
704
598 - parent to root: --rev . --rev 0
705 - parent to root: --rev . --rev 0
706 M a
599 R b
707 R b
600 R c
708 R c
601
709
710 diff --git a/a b/a
711 --- a/a
712 +++ b/a
713 @@ -1,2 +1,1 @@
714 a
715 -5
602 diff --git a/b b/b
716 diff --git a/b b/b
603 deleted file mode 100644
717 deleted file mode 100644
604 --- a/b
718 --- a/b
605 +++ /dev/null
719 +++ /dev/null
606 @@ -1,1 +0,0 @@
720 @@ -1,2 +0,0 @@
607 -a
721 -a
722 -5
608 diff --git a/c b/c
723 diff --git a/c b/c
609 deleted file mode 100644
724 deleted file mode 100644
610 --- a/c
725 --- a/c
611 +++ /dev/null
726 +++ /dev/null
612 @@ -1,1 +0,0 @@
727 @@ -1,2 +0,0 @@
613 -a
728 -a
729 -5
614
730
615 - branch to parent: --rev 2 --rev .
731 - branch to parent: --rev 2 --rev .
616 M a
732 M a
@@ -622,28 +738,31 b' A c'
622 diff --git a/a b/a
738 diff --git a/a b/a
623 --- a/a
739 --- a/a
624 +++ b/a
740 +++ b/a
625 @@ -1,3 +1,1 @@
741 @@ -1,3 +1,2 @@
626 a
742 a
627 -m1
743 -m1
628 -m2
744 -m2
745 +5
629 diff --git a/a b/b
746 diff --git a/a b/b
630 copy from a
747 copy from a
631 copy to b
748 copy to b
632 --- a/a
749 --- a/a
633 +++ b/b
750 +++ b/b
634 @@ -1,3 +1,1 @@
751 @@ -1,3 +1,2 @@
635 a
752 a
636 -m1
753 -m1
637 -m2
754 -m2
755 +5
638 diff --git a/a b/c
756 diff --git a/a b/c
639 copy from a
757 copy from a
640 copy to c
758 copy to c
641 --- a/a
759 --- a/a
642 +++ b/c
760 +++ b/c
643 @@ -1,3 +1,1 @@
761 @@ -1,3 +1,2 @@
644 a
762 a
645 -m1
763 -m1
646 -m2
764 -m2
765 +5
647
766
648 - parent to branch: --rev . --rev 2
767 - parent to branch: --rev . --rev 2
649 M a
768 M a
@@ -653,21 +772,24 b' R c'
653 diff --git a/a b/a
772 diff --git a/a b/a
654 --- a/a
773 --- a/a
655 +++ b/a
774 +++ b/a
656 @@ -1,1 +1,3 @@
775 @@ -1,2 +1,3 @@
657 a
776 a
777 -5
658 +m1
778 +m1
659 +m2
779 +m2
660 diff --git a/b b/b
780 diff --git a/b b/b
661 deleted file mode 100644
781 deleted file mode 100644
662 --- a/b
782 --- a/b
663 +++ /dev/null
783 +++ /dev/null
664 @@ -1,1 +0,0 @@
784 @@ -1,2 +0,0 @@
665 -a
785 -a
786 -5
666 diff --git a/c b/c
787 diff --git a/c b/c
667 deleted file mode 100644
788 deleted file mode 100644
668 --- a/c
789 --- a/c
669 +++ /dev/null
790 +++ /dev/null
670 @@ -1,1 +0,0 @@
791 @@ -1,2 +0,0 @@
671 -a
792 -a
793 -5
672
794
673
795
General Comments 0
You need to be logged in to leave comments. Login now