##// END OF EJS Templates
copies: delete debug message about "unmatched files new in both"...
Martin von Zweigbergk -
r42345:1e266bd9 default draft
parent child Browse files
Show More
@@ -625,9 +625,6 b' def _fullcopytracing(repo, c1, c2, base)'
625 else:
625 else:
626 divergeset.update(fl) # reverse map for below
626 divergeset.update(fl) # reverse map for below
627
627
628 if bothnew:
629 repo.ui.debug(" unmatched files new in both:\n %s\n"
630 % "\n ".join(bothnew))
631 bothdiverge = {}
628 bothdiverge = {}
632 bothincompletediverge = {}
629 bothincompletediverge = {}
633 remainder = {}
630 remainder = {}
@@ -737,8 +737,6 b' Transplants of grafts can find a destina'
737 $ hg graft -q 13 --debug
737 $ hg graft -q 13 --debug
738 scanning for duplicate grafts
738 scanning for duplicate grafts
739 grafting 13:7a4785234d87 "2"
739 grafting 13:7a4785234d87 "2"
740 unmatched files new in both:
741 b
742 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
740 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
743 src: 'a' -> dst: 'b' *
741 src: 'a' -> dst: 'b' *
744 checking for directory renames
742 checking for directory renames
@@ -354,8 +354,6 b' args:'
354 --------------
354 --------------
355 test L:um a b R:um a b W: - 9 do merge with ancestor in a
355 test L:um a b R:um a b W: - 9 do merge with ancestor in a
356 --------------
356 --------------
357 unmatched files new in both:
358 b
359 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
357 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
360 src: 'a' -> dst: 'b' *
358 src: 'a' -> dst: 'b' *
361 checking for directory renames
359 checking for directory renames
@@ -435,8 +433,6 b' m "um a c" "um x c" " " "10 do merg'
435 --------------
433 --------------
436 test L:nc a b R:up b W: - 12 merge b no ancestor
434 test L:nc a b R:up b W: - 12 merge b no ancestor
437 --------------
435 --------------
438 unmatched files new in both:
439 b
440 resolving manifests
436 resolving manifests
441 branchmerge: True, force: False, partial: False
437 branchmerge: True, force: False, partial: False
442 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7
438 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7
@@ -473,8 +469,6 b' m "um a c" "um x c" " " "10 do merg'
473 --------------
469 --------------
474 test L:up b R:nm a b W: - 13 merge b no ancestor
470 test L:up b R:nm a b W: - 13 merge b no ancestor
475 --------------
471 --------------
476 unmatched files new in both:
477 b
478 resolving manifests
472 resolving manifests
479 branchmerge: True, force: False, partial: False
473 branchmerge: True, force: False, partial: False
480 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
474 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
@@ -512,8 +506,6 b' m "um a c" "um x c" " " "10 do merg'
512 --------------
506 --------------
513 test L:nc a b R:up a b W: - 14 merge b no ancestor
507 test L:nc a b R:up a b W: - 14 merge b no ancestor
514 --------------
508 --------------
515 unmatched files new in both:
516 b
517 resolving manifests
509 resolving manifests
518 branchmerge: True, force: False, partial: False
510 branchmerge: True, force: False, partial: False
519 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
511 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
@@ -551,8 +543,6 b' m "um a c" "um x c" " " "10 do merg'
551 --------------
543 --------------
552 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a
544 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a
553 --------------
545 --------------
554 unmatched files new in both:
555 b
556 resolving manifests
546 resolving manifests
557 branchmerge: True, force: False, partial: False
547 branchmerge: True, force: False, partial: False
558 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
548 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
@@ -590,8 +580,6 b' m "um a c" "um x c" " " "10 do merg'
590 --------------
580 --------------
591 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor
581 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor
592 --------------
582 --------------
593 unmatched files new in both:
594 b
595 resolving manifests
583 resolving manifests
596 branchmerge: True, force: False, partial: False
584 branchmerge: True, force: False, partial: False
597 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
585 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
@@ -629,8 +617,6 b' m "um a c" "um x c" " " "10 do merg'
629 --------------
617 --------------
630 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor
618 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor
631 --------------
619 --------------
632 unmatched files new in both:
633 b
634 resolving manifests
620 resolving manifests
635 branchmerge: True, force: False, partial: False
621 branchmerge: True, force: False, partial: False
636 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24
622 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24
@@ -667,8 +653,6 b' m "um a c" "um x c" " " "10 do merg'
667 --------------
653 --------------
668 test L:nm a b R:up a b W: - 18 merge b no ancestor
654 test L:nm a b R:up a b W: - 18 merge b no ancestor
669 --------------
655 --------------
670 unmatched files new in both:
671 b
672 resolving manifests
656 resolving manifests
673 branchmerge: True, force: False, partial: False
657 branchmerge: True, force: False, partial: False
674 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a
658 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a
@@ -711,8 +695,6 b' m "um a c" "um x c" " " "10 do merg'
711 --------------
695 --------------
712 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a
696 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a
713 --------------
697 --------------
714 unmatched files new in both:
715 b
716 resolving manifests
698 resolving manifests
717 branchmerge: True, force: False, partial: False
699 branchmerge: True, force: False, partial: False
718 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
700 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
@@ -929,9 +911,6 b' 8 f (f) f f "remote differs from '
929 3/g
911 3/g
930 4/g
912 4/g
931 7/f
913 7/f
932 unmatched files new in both:
933 0/f
934 1/g
935 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
914 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
936 src: '1/f' -> dst: '1/g' *
915 src: '1/f' -> dst: '1/g' *
937 src: '3/f' -> dst: '3/g' *
916 src: '3/f' -> dst: '3/g' *
General Comments 0
You need to be logged in to leave comments. Login now