|
@@
-98,6
+98,8
b' args:'
|
|
98
|
98
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
99
|
99
|
merging rev
|
|
100
|
100
|
my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
|
|
|
101
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
102
|
my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
|
|
101
|
103
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
102
|
104
|
merge tool returned: 0
|
|
103
|
105
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
@@
-135,7
+137,9
b' args:'
|
|
135
|
137
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
136
|
138
|
merging rev
|
|
137
|
139
|
my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
|
|
138
|
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * (glob)
|
|
|
140
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
141
|
my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
|
|
|
142
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
139
|
143
|
merge tool returned: 0
|
|
140
|
144
|
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
141
|
145
|
(branch merge, don't forget to commit)
|
|
@@
-171,6
+175,8
b' args:'
|
|
171
|
175
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
172
|
176
|
merging rev
|
|
173
|
177
|
my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
|
|
|
178
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
179
|
my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
|
|
174
|
180
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
175
|
181
|
merge tool returned: 0
|
|
176
|
182
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
@@
-205,6
+211,8
b' args:'
|
|
205
|
211
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
206
|
212
|
merging rev
|
|
207
|
213
|
my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
|
|
|
214
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
215
|
my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
|
|
208
|
216
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
209
|
217
|
merge tool returned: 0
|
|
210
|
218
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
@@
-235,6
+243,8
b' args:'
|
|
235
|
243
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
236
|
244
|
merging rev
|
|
237
|
245
|
my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
|
|
|
246
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
247
|
my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
|
|
238
|
248
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
239
|
249
|
merge tool returned: 0
|
|
240
|
250
|
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
@@
-263,6
+273,8
b' args:'
|
|
263
|
273
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
264
|
274
|
merging rev
|
|
265
|
275
|
my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
|
|
|
276
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
277
|
my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
|
|
266
|
278
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
267
|
279
|
merge tool returned: 0
|
|
268
|
280
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
@@
-295,6
+307,8
b' args:'
|
|
295
|
307
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
296
|
308
|
merging rev
|
|
297
|
309
|
my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
|
|
|
310
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
311
|
my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
|
|
298
|
312
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
299
|
313
|
merge tool returned: 0
|
|
300
|
314
|
1 files updated, 1 files merged, 1 files removed, 0 files unresolved
|
|
@@
-322,6
+336,8
b' args:'
|
|
322
|
336
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
323
|
337
|
merging rev
|
|
324
|
338
|
my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
|
|
|
339
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
340
|
my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
|
|
325
|
341
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
326
|
342
|
merge tool returned: 0
|
|
327
|
343
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
@@
-347,12
+363,16
b' args:'
|
|
347
|
363
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
348
|
364
|
merging b
|
|
349
|
365
|
my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
|
|
|
366
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
|
367
|
my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
|
|
350
|
368
|
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
|
|
351
|
369
|
merge tool returned: 0
|
|
352
|
370
|
rev: versions differ -> m
|
|
353
|
371
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
354
|
372
|
merging rev
|
|
355
|
373
|
my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
|
|
|
374
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
375
|
my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
|
|
356
|
376
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
357
|
377
|
merge tool returned: 0
|
|
358
|
378
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
@@
-388,6
+408,8
b' m "um a c" "um x c" " " "10 do merg'
|
|
388
|
408
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
389
|
409
|
merging rev
|
|
390
|
410
|
my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
|
|
|
411
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
412
|
my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
|
|
391
|
413
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
392
|
414
|
merge tool returned: 0
|
|
393
|
415
|
note: possible conflict - a was renamed multiple times to:
|
|
@@
-417,12
+439,16
b' m "um a c" "um x c" " " "10 do merg'
|
|
417
|
439
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
418
|
440
|
merging b
|
|
419
|
441
|
my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
|
|
|
442
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
|
443
|
my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
|
|
420
|
444
|
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
|
|
421
|
445
|
merge tool returned: 0
|
|
422
|
446
|
rev: versions differ -> m
|
|
423
|
447
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
424
|
448
|
merging rev
|
|
425
|
449
|
my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
|
|
|
450
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
451
|
my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
|
|
426
|
452
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
427
|
453
|
merge tool returned: 0
|
|
428
|
454
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
@@
-451,12
+477,16
b' m "um a c" "um x c" " " "10 do merg'
|
|
451
|
477
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
452
|
478
|
merging b
|
|
453
|
479
|
my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
|
|
|
480
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
|
481
|
my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
|
|
454
|
482
|
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
|
|
455
|
483
|
merge tool returned: 0
|
|
456
|
484
|
rev: versions differ -> m
|
|
457
|
485
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
458
|
486
|
merging rev
|
|
459
|
487
|
my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
|
|
|
488
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
489
|
my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
|
|
460
|
490
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
461
|
491
|
merge tool returned: 0
|
|
462
|
492
|
0 files updated, 2 files merged, 1 files removed, 0 files unresolved
|
|
@@
-484,12
+514,16
b' m "um a c" "um x c" " " "10 do merg'
|
|
484
|
514
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
485
|
515
|
merging b
|
|
486
|
516
|
my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
|
|
|
517
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
|
518
|
my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
|
|
487
|
519
|
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
|
|
488
|
520
|
merge tool returned: 0
|
|
489
|
521
|
rev: versions differ -> m
|
|
490
|
522
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
491
|
523
|
merging rev
|
|
492
|
524
|
my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
|
|
|
525
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
526
|
my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
|
|
493
|
527
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
494
|
528
|
merge tool returned: 0
|
|
495
|
529
|
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
@@
-518,12
+552,16
b' m "um a c" "um x c" " " "10 do merg'
|
|
518
|
552
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
519
|
553
|
merging b
|
|
520
|
554
|
my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
|
|
|
555
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
|
556
|
my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
|
|
521
|
557
|
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
|
|
522
|
558
|
merge tool returned: 0
|
|
523
|
559
|
rev: versions differ -> m
|
|
524
|
560
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
525
|
561
|
merging rev
|
|
526
|
562
|
my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
|
|
|
563
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
564
|
my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
|
|
527
|
565
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
528
|
566
|
merge tool returned: 0
|
|
529
|
567
|
0 files updated, 2 files merged, 1 files removed, 0 files unresolved
|
|
@@
-551,12
+589,16
b' m "um a c" "um x c" " " "10 do merg'
|
|
551
|
589
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
552
|
590
|
merging b
|
|
553
|
591
|
my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
|
|
|
592
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
|
593
|
my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
|
|
554
|
594
|
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
|
|
555
|
595
|
merge tool returned: 0
|
|
556
|
596
|
rev: versions differ -> m
|
|
557
|
597
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
558
|
598
|
merging rev
|
|
559
|
599
|
my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
|
|
|
600
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
601
|
my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
|
|
560
|
602
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
561
|
603
|
merge tool returned: 0
|
|
562
|
604
|
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
@@
-584,12
+626,16
b' m "um a c" "um x c" " " "10 do merg'
|
|
584
|
626
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
585
|
627
|
merging b
|
|
586
|
628
|
my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000
|
|
|
629
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
|
630
|
my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000
|
|
587
|
631
|
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
|
|
588
|
632
|
merge tool returned: 0
|
|
589
|
633
|
rev: versions differ -> m
|
|
590
|
634
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
591
|
635
|
merging rev
|
|
592
|
636
|
my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
|
|
|
637
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
638
|
my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
|
|
593
|
639
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
594
|
640
|
merge tool returned: 0
|
|
595
|
641
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
@@
-620,12
+666,16
b' m "um a c" "um x c" " " "10 do merg'
|
|
620
|
666
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
621
|
667
|
merging b
|
|
622
|
668
|
my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000
|
|
|
669
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
|
670
|
my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000
|
|
623
|
671
|
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
|
|
624
|
672
|
merge tool returned: 0
|
|
625
|
673
|
rev: versions differ -> m
|
|
626
|
674
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
627
|
675
|
merging rev
|
|
628
|
676
|
my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
|
|
|
677
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
678
|
my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
|
|
629
|
679
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
630
|
680
|
merge tool returned: 0
|
|
631
|
681
|
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
@@
-655,12
+705,16
b' m "um a c" "um x c" " " "10 do merg'
|
|
655
|
705
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
656
|
706
|
merging b
|
|
657
|
707
|
my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
|
|
|
708
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
|
709
|
my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
|
|
658
|
710
|
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
|
|
659
|
711
|
merge tool returned: 0
|
|
660
|
712
|
rev: versions differ -> m
|
|
661
|
713
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
662
|
714
|
merging rev
|
|
663
|
715
|
my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
|
|
|
716
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
717
|
my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
|
|
664
|
718
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
665
|
719
|
merge tool returned: 0
|
|
666
|
720
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
@@
-691,12
+745,16
b' m "um a c" "um x c" " " "10 do merg'
|
|
691
|
745
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
692
|
746
|
merging a and b to b
|
|
693
|
747
|
my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
|
|
|
748
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
|
749
|
my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
|
|
694
|
750
|
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
|
|
695
|
751
|
merge tool returned: 0
|
|
696
|
752
|
rev: versions differ -> m
|
|
697
|
753
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
698
|
754
|
merging rev
|
|
699
|
755
|
my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
|
|
|
756
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
757
|
my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
|
|
700
|
758
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
701
|
759
|
merge tool returned: 0
|
|
702
|
760
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
@@
-726,12
+784,16
b' m "um a c" "um x c" " " "10 do merg'
|
|
726
|
784
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
727
|
785
|
merging b and a to b
|
|
728
|
786
|
my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
|
|
|
787
|
picked tool 'python ../merge' for b (binary False symlink False)
|
|
|
788
|
my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
|
|
729
|
789
|
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
|
|
730
|
790
|
merge tool returned: 0
|
|
731
|
791
|
rev: versions differ -> m
|
|
732
|
792
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
733
|
793
|
merging rev
|
|
734
|
794
|
my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
|
|
|
795
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
796
|
my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
|
|
735
|
797
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
736
|
798
|
merge tool returned: 0
|
|
737
|
799
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
@@
-773,6
+835,8
b' m "nm a b" "um x a" " " "22 get a, '
|
|
773
|
835
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
774
|
836
|
merging rev
|
|
775
|
837
|
my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
|
|
|
838
|
picked tool 'python ../merge' for rev (binary False symlink False)
|
|
|
839
|
my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
|
|
776
|
840
|
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
|
|
777
|
841
|
merge tool returned: 0
|
|
778
|
842
|
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
|