changeset 42211:a68036b849b0

copies: delete debug message about "unmatched files new in both" Same reasoning as previous patch. Differential Revision: https://phab.mercurial-scm.org/D6251
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 15 Apr 2019 14:09:18 -0700
parents 341bddf88ac5
children 6631f3e89b6f
files mercurial/copies.py tests/test-graft.t tests/test-rename-merge2.t
diffstat 3 files changed, 0 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/copies.py	Fri Apr 12 21:41:51 2019 -0700
+++ b/mercurial/copies.py	Mon Apr 15 14:09:18 2019 -0700
@@ -625,9 +625,6 @@
         else:
             divergeset.update(fl) # reverse map for below
 
-    if bothnew:
-        repo.ui.debug("  unmatched files new in both:\n   %s\n"
-                      % "\n   ".join(bothnew))
     bothdiverge = {}
     bothincompletediverge = {}
     remainder = {}
--- a/tests/test-graft.t	Fri Apr 12 21:41:51 2019 -0700
+++ b/tests/test-graft.t	Mon Apr 15 14:09:18 2019 -0700
@@ -737,8 +737,6 @@
   $ hg graft -q 13 --debug
   scanning for duplicate grafts
   grafting 13:7a4785234d87 "2"
-    unmatched files new in both:
-     b
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
      src: 'a' -> dst: 'b' *
     checking for directory renames
--- a/tests/test-rename-merge2.t	Fri Apr 12 21:41:51 2019 -0700
+++ b/tests/test-rename-merge2.t	Mon Apr 15 14:09:18 2019 -0700
@@ -354,8 +354,6 @@
   --------------
   test L:um a b R:um a b W:       - 9  do merge with ancestor in a
   --------------
-    unmatched files new in both:
-     b
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
      src: 'a' -> dst: 'b' *
     checking for directory renames
@@ -435,8 +433,6 @@
   --------------
   test L:nc a b R:up b   W:       - 12 merge b no ancestor
   --------------
-    unmatched files new in both:
-     b
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7
@@ -473,8 +469,6 @@
   --------------
   test L:up b   R:nm a b W:       - 13 merge b no ancestor
   --------------
-    unmatched files new in both:
-     b
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
@@ -512,8 +506,6 @@
   --------------
   test L:nc a b R:up a b W:       - 14 merge b no ancestor
   --------------
-    unmatched files new in both:
-     b
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
@@ -551,8 +543,6 @@
   --------------
   test L:up b   R:nm a b W:       - 15 merge b no ancestor, remove a
   --------------
-    unmatched files new in both:
-     b
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
@@ -590,8 +580,6 @@
   --------------
   test L:nc a b R:up a b W:       - 16 get a, merge b no ancestor
   --------------
-    unmatched files new in both:
-     b
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
@@ -629,8 +617,6 @@
   --------------
   test L:up a b R:nc a b W:       - 17 keep a, merge b no ancestor
   --------------
-    unmatched files new in both:
-     b
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24
@@ -667,8 +653,6 @@
   --------------
   test L:nm a b R:up a b W:       - 18 merge b no ancestor
   --------------
-    unmatched files new in both:
-     b
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a
@@ -711,8 +695,6 @@
   --------------
   test L:up a b R:nm a b W:       - 19 merge b no ancestor, prompt remove a
   --------------
-    unmatched files new in both:
-     b
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
@@ -929,9 +911,6 @@
      3/g
      4/g
      7/f
-    unmatched files new in both:
-     0/f
-     1/g
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
      src: '1/f' -> dst: '1/g' *
      src: '3/f' -> dst: '3/g' *