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

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

merge: better debug messages before/after invoking external merge tool
Mads Kiilerich -
r24727:5668202c default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -304,7 +304,10 b' def _xmerge(repo, mynode, orig, fcd, fco'
304 replace = {'local': a, 'base': b, 'other': c, 'output': out}
304 replace = {'local': a, 'base': b, 'other': c, 'output': out}
305 args = util.interpolate(r'\$', replace, args,
305 args = util.interpolate(r'\$', replace, args,
306 lambda s: util.shellquote(util.localpath(s)))
306 lambda s: util.shellquote(util.localpath(s)))
307 r = ui.system(toolpath + ' ' + args, cwd=repo.root, environ=env)
307 cmd = toolpath + ' ' + args
308 repo.ui.debug('launching merge tool: %s\n' % cmd)
309 r = ui.system(cmd, cwd=repo.root, environ=env)
310 repo.ui.debug('merge tool returned: %s\n' % r)
308 return True, r
311 return True, r
309 return False, 0
312 return False, 0
310
313
Show file before | Show file after | Hide comments
@@ -100,6 +100,8 b' args:'
100 picked tool 'python ../merge' for rev (binary False symlink False)
100 picked tool 'python ../merge' for rev (binary False symlink False)
101 merging rev
101 merging rev
102 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
102 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
103 launching merge tool: python ../merge $TESTTMP/t/t/rev '*' '*' (glob)
104 merge tool returned: 0
103 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
105 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
104 (branch merge, don't forget to commit)
106 (branch merge, don't forget to commit)
105 --------------
107 --------------
@@ -138,6 +140,8 b' args:'
138 picked tool 'python ../merge' for rev (binary False symlink False)
140 picked tool 'python ../merge' for rev (binary False symlink False)
139 merging rev
141 merging rev
140 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
142 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
143 launching merge tool: python ../merge $TESTTMP/t/t/rev * (glob)
144 merge tool returned: 0
141 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
145 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
142 (branch merge, don't forget to commit)
146 (branch merge, don't forget to commit)
143 --------------
147 --------------
@@ -174,6 +178,8 b' args:'
174 picked tool 'python ../merge' for rev (binary False symlink False)
178 picked tool 'python ../merge' for rev (binary False symlink False)
175 merging rev
179 merging rev
176 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
180 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
181 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
182 merge tool returned: 0
177 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
183 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
178 (branch merge, don't forget to commit)
184 (branch merge, don't forget to commit)
179 --------------
185 --------------
@@ -208,6 +214,8 b' args:'
208 picked tool 'python ../merge' for rev (binary False symlink False)
214 picked tool 'python ../merge' for rev (binary False symlink False)
209 merging rev
215 merging rev
210 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
216 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
217 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
218 merge tool returned: 0
211 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
219 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
212 (branch merge, don't forget to commit)
220 (branch merge, don't forget to commit)
213 --------------
221 --------------
@@ -238,6 +246,8 b' args:'
238 picked tool 'python ../merge' for rev (binary False symlink False)
246 picked tool 'python ../merge' for rev (binary False symlink False)
239 merging rev
247 merging rev
240 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
248 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
249 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
250 merge tool returned: 0
241 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
251 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
242 (branch merge, don't forget to commit)
252 (branch merge, don't forget to commit)
243 --------------
253 --------------
@@ -265,6 +275,8 b' args:'
265 picked tool 'python ../merge' for rev (binary False symlink False)
275 picked tool 'python ../merge' for rev (binary False symlink False)
266 merging rev
276 merging rev
267 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
277 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
278 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
279 merge tool returned: 0
268 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
280 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
269 (branch merge, don't forget to commit)
281 (branch merge, don't forget to commit)
270 --------------
282 --------------
@@ -298,6 +310,8 b' args:'
298 picked tool 'python ../merge' for rev (binary False symlink False)
310 picked tool 'python ../merge' for rev (binary False symlink False)
299 merging rev
311 merging rev
300 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
312 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
313 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
314 merge tool returned: 0
301 1 files updated, 1 files merged, 1 files removed, 0 files unresolved
315 1 files updated, 1 files merged, 1 files removed, 0 files unresolved
302 (branch merge, don't forget to commit)
316 (branch merge, don't forget to commit)
303 --------------
317 --------------
@@ -324,6 +338,8 b' args:'
324 picked tool 'python ../merge' for rev (binary False symlink False)
338 picked tool 'python ../merge' for rev (binary False symlink False)
325 merging rev
339 merging rev
326 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
340 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
341 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
342 merge tool returned: 0
327 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
343 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
328 (branch merge, don't forget to commit)
344 (branch merge, don't forget to commit)
329 --------------
345 --------------
@@ -348,11 +364,15 b' args:'
348 picked tool 'python ../merge' for b (binary False symlink False)
364 picked tool 'python ../merge' for b (binary False symlink False)
349 merging b
365 merging b
350 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
366 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
367 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
368 merge tool returned: 0
351 rev: versions differ -> m
369 rev: versions differ -> m
352 updating: rev 2/2 files (100.00%)
370 updating: rev 2/2 files (100.00%)
353 picked tool 'python ../merge' for rev (binary False symlink False)
371 picked tool 'python ../merge' for rev (binary False symlink False)
354 merging rev
372 merging rev
355 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
373 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
374 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
375 merge tool returned: 0
356 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
376 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
357 (branch merge, don't forget to commit)
377 (branch merge, don't forget to commit)
358 --------------
378 --------------
@@ -388,6 +408,8 b' m "um a c" "um x c" " " "10 do merg'
388 picked tool 'python ../merge' for rev (binary False symlink False)
408 picked tool 'python ../merge' for rev (binary False symlink False)
389 merging rev
409 merging rev
390 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
410 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
411 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
412 merge tool returned: 0
391 note: possible conflict - a was renamed multiple times to:
413 note: possible conflict - a was renamed multiple times to:
392 b
414 b
393 c
415 c
@@ -416,11 +438,15 b' m "um a c" "um x c" " " "10 do merg'
416 picked tool 'python ../merge' for b (binary False symlink False)
438 picked tool 'python ../merge' for b (binary False symlink False)
417 merging b
439 merging b
418 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
440 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
441 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
442 merge tool returned: 0
419 rev: versions differ -> m
443 rev: versions differ -> m
420 updating: rev 2/2 files (100.00%)
444 updating: rev 2/2 files (100.00%)
421 picked tool 'python ../merge' for rev (binary False symlink False)
445 picked tool 'python ../merge' for rev (binary False symlink False)
422 merging rev
446 merging rev
423 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
447 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
448 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
449 merge tool returned: 0
424 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
450 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
425 (branch merge, don't forget to commit)
451 (branch merge, don't forget to commit)
426 --------------
452 --------------
@@ -449,11 +475,15 b' m "um a c" "um x c" " " "10 do merg'
449 picked tool 'python ../merge' for b (binary False symlink False)
475 picked tool 'python ../merge' for b (binary False symlink False)
450 merging b
476 merging b
451 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
477 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
478 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
479 merge tool returned: 0
452 rev: versions differ -> m
480 rev: versions differ -> m
453 updating: rev 3/3 files (100.00%)
481 updating: rev 3/3 files (100.00%)
454 picked tool 'python ../merge' for rev (binary False symlink False)
482 picked tool 'python ../merge' for rev (binary False symlink False)
455 merging rev
483 merging rev
456 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
484 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
485 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
486 merge tool returned: 0
457 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
487 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
458 (branch merge, don't forget to commit)
488 (branch merge, don't forget to commit)
459 --------------
489 --------------
@@ -481,11 +511,15 b' m "um a c" "um x c" " " "10 do merg'
481 picked tool 'python ../merge' for b (binary False symlink False)
511 picked tool 'python ../merge' for b (binary False symlink False)
482 merging b
512 merging b
483 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
513 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
514 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
515 merge tool returned: 0
484 rev: versions differ -> m
516 rev: versions differ -> m
485 updating: rev 3/3 files (100.00%)
517 updating: rev 3/3 files (100.00%)
486 picked tool 'python ../merge' for rev (binary False symlink False)
518 picked tool 'python ../merge' for rev (binary False symlink False)
487 merging rev
519 merging rev
488 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
520 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
521 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
522 merge tool returned: 0
489 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
523 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
490 (branch merge, don't forget to commit)
524 (branch merge, don't forget to commit)
491 --------------
525 --------------
@@ -514,11 +548,15 b' m "um a c" "um x c" " " "10 do merg'
514 picked tool 'python ../merge' for b (binary False symlink False)
548 picked tool 'python ../merge' for b (binary False symlink False)
515 merging b
549 merging b
516 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
550 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
551 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
552 merge tool returned: 0
517 rev: versions differ -> m
553 rev: versions differ -> m
518 updating: rev 3/3 files (100.00%)
554 updating: rev 3/3 files (100.00%)
519 picked tool 'python ../merge' for rev (binary False symlink False)
555 picked tool 'python ../merge' for rev (binary False symlink False)
520 merging rev
556 merging rev
521 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
557 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
558 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
559 merge tool returned: 0
522 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
560 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
523 (branch merge, don't forget to commit)
561 (branch merge, don't forget to commit)
524 --------------
562 --------------
@@ -546,11 +584,15 b' m "um a c" "um x c" " " "10 do merg'
546 picked tool 'python ../merge' for b (binary False symlink False)
584 picked tool 'python ../merge' for b (binary False symlink False)
547 merging b
585 merging b
548 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
586 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
587 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
588 merge tool returned: 0
549 rev: versions differ -> m
589 rev: versions differ -> m
550 updating: rev 3/3 files (100.00%)
590 updating: rev 3/3 files (100.00%)
551 picked tool 'python ../merge' for rev (binary False symlink False)
591 picked tool 'python ../merge' for rev (binary False symlink False)
552 merging rev
592 merging rev
553 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
593 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
594 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
595 merge tool returned: 0
554 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
596 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
555 (branch merge, don't forget to commit)
597 (branch merge, don't forget to commit)
556 --------------
598 --------------
@@ -577,11 +619,15 b' m "um a c" "um x c" " " "10 do merg'
577 picked tool 'python ../merge' for b (binary False symlink False)
619 picked tool 'python ../merge' for b (binary False symlink False)
578 merging b
620 merging b
579 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000
621 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000
622 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
623 merge tool returned: 0
580 rev: versions differ -> m
624 rev: versions differ -> m
581 updating: rev 2/2 files (100.00%)
625 updating: rev 2/2 files (100.00%)
582 picked tool 'python ../merge' for rev (binary False symlink False)
626 picked tool 'python ../merge' for rev (binary False symlink False)
583 merging rev
627 merging rev
584 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
628 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
629 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
630 merge tool returned: 0
585 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
631 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
586 (branch merge, don't forget to commit)
632 (branch merge, don't forget to commit)
587 --------------
633 --------------
@@ -612,11 +658,15 b' m "um a c" "um x c" " " "10 do merg'
612 picked tool 'python ../merge' for b (binary False symlink False)
658 picked tool 'python ../merge' for b (binary False symlink False)
613 merging b
659 merging b
614 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000
660 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000
661 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
662 merge tool returned: 0
615 rev: versions differ -> m
663 rev: versions differ -> m
616 updating: rev 3/3 files (100.00%)
664 updating: rev 3/3 files (100.00%)
617 picked tool 'python ../merge' for rev (binary False symlink False)
665 picked tool 'python ../merge' for rev (binary False symlink False)
618 merging rev
666 merging rev
619 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
667 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
668 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
669 merge tool returned: 0
620 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
670 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
621 (branch merge, don't forget to commit)
671 (branch merge, don't forget to commit)
622 --------------
672 --------------
@@ -646,11 +696,15 b' m "um a c" "um x c" " " "10 do merg'
646 picked tool 'python ../merge' for b (binary False symlink False)
696 picked tool 'python ../merge' for b (binary False symlink False)
647 merging b
697 merging b
648 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
698 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
699 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
700 merge tool returned: 0
649 rev: versions differ -> m
701 rev: versions differ -> m
650 updating: rev 3/3 files (100.00%)
702 updating: rev 3/3 files (100.00%)
651 picked tool 'python ../merge' for rev (binary False symlink False)
703 picked tool 'python ../merge' for rev (binary False symlink False)
652 merging rev
704 merging rev
653 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
705 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
706 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
707 merge tool returned: 0
654 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
708 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
655 (branch merge, don't forget to commit)
709 (branch merge, don't forget to commit)
656 --------------
710 --------------
@@ -680,11 +734,15 b' m "um a c" "um x c" " " "10 do merg'
680 picked tool 'python ../merge' for b (binary False symlink False)
734 picked tool 'python ../merge' for b (binary False symlink False)
681 merging a and b to b
735 merging a and b to b
682 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
736 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
737 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
738 merge tool returned: 0
683 rev: versions differ -> m
739 rev: versions differ -> m
684 updating: rev 2/2 files (100.00%)
740 updating: rev 2/2 files (100.00%)
685 picked tool 'python ../merge' for rev (binary False symlink False)
741 picked tool 'python ../merge' for rev (binary False symlink False)
686 merging rev
742 merging rev
687 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
743 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
744 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
745 merge tool returned: 0
688 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
746 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
689 (branch merge, don't forget to commit)
747 (branch merge, don't forget to commit)
690 --------------
748 --------------
@@ -713,11 +771,15 b' m "um a c" "um x c" " " "10 do merg'
713 picked tool 'python ../merge' for b (binary False symlink False)
771 picked tool 'python ../merge' for b (binary False symlink False)
714 merging b and a to b
772 merging b and a to b
715 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
773 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
774 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
775 merge tool returned: 0
716 rev: versions differ -> m
776 rev: versions differ -> m
717 updating: rev 2/2 files (100.00%)
777 updating: rev 2/2 files (100.00%)
718 picked tool 'python ../merge' for rev (binary False symlink False)
778 picked tool 'python ../merge' for rev (binary False symlink False)
719 merging rev
779 merging rev
720 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
780 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
781 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
782 merge tool returned: 0
721 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
783 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
722 (branch merge, don't forget to commit)
784 (branch merge, don't forget to commit)
723 --------------
785 --------------
@@ -760,6 +822,8 b' m "nm a b" "um x a" " " "22 get a, '
760 picked tool 'python ../merge' for rev (binary False symlink False)
822 picked tool 'python ../merge' for rev (binary False symlink False)
761 merging rev
823 merging rev
762 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
824 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
825 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
826 merge tool returned: 0
763 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
827 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
764 (branch merge, don't forget to commit)
828 (branch merge, don't forget to commit)
765 --------------
829 --------------
Show file before | Show file after | Hide comments
@@ -55,6 +55,8 b''
55 picked tool 'true' for a (binary False symlink False)
55 picked tool 'true' for a (binary False symlink False)
56 merging a
56 merging a
57 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
57 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
58 launching merge tool: true $TESTTMP/r2/a * (glob)
59 merge tool returned: 0
58 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
60 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
59 $ hg parents
61 $ hg parents
60 changeset: 1:1e71731e6fbb
62 changeset: 1:1e71731e6fbb
@@ -76,6 +78,8 b''
76 picked tool 'true' for a (binary False symlink False)
78 picked tool 'true' for a (binary False symlink False)
77 merging a
79 merging a
78 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
80 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
81 launching merge tool: true $TESTTMP/r2/a * (glob)
82 merge tool returned: 0
79 0 files updated, 1 files merged, 1 files removed, 0 files unresolved
83 0 files updated, 1 files merged, 1 files removed, 0 files unresolved
80 $ hg parents
84 $ hg parents
81 changeset: 0:c19d34741b0a
85 changeset: 0:c19d34741b0a
@@ -105,6 +109,8 b''
105 picked tool 'true' for a (binary False symlink False)
109 picked tool 'true' for a (binary False symlink False)
106 merging a
110 merging a
107 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
111 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
112 launching merge tool: true $TESTTMP/r2/a * (glob)
113 merge tool returned: 0
108 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
114 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
109 $ hg parents
115 $ hg parents
110 changeset: 1:1e71731e6fbb
116 changeset: 1:1e71731e6fbb
General Comments 0
You need to be logged in to leave comments. Login now