martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REVISION SUMMARY Same reasoning as previous patch. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6251 AFFECTED FILES mercurial/copies.py tests/test-graft.t tests/test-rename-merge2.t CHANGE DETAILS diff --git a/tests/test-rename-merge2.t b/tests/test-rename-merge2.t --- a/tests/test-rename-merge2.t +++ b/tests/test-rename-merge2.t @@ -355,8 +355,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 @@ -436,8 +434,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 @@ -474,8 +470,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 @@ -513,8 +507,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 @@ -552,8 +544,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 @@ -591,8 +581,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 @@ -630,8 +618,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 @@ -668,8 +654,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 @@ -712,8 +696,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 @@ -930,9 +912,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' * diff --git a/tests/test-graft.t b/tests/test-graft.t --- a/tests/test-graft.t +++ b/tests/test-graft.t @@ -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 diff --git a/mercurial/copies.py b/mercurial/copies.py --- a/mercurial/copies.py +++ b/mercurial/copies.py @@ -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 = {} To: martinvonz, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
