diff --git a/mercurial/copies.py b/mercurial/copies.py --- a/mercurial/copies.py +++ b/mercurial/copies.py @@ -763,6 +763,11 @@ base = x x_copies = _forwardcopies(a, x) y_copies = _forwardcopies(a, y, base, match=match) + same_keys = set(x_copies) & set(y_copies) + for k in same_keys: + if x_copies.get(k) == y_copies.get(k): + del x_copies[k] + del y_copies[k] x_backward_renames = _reverse_renames(x_copies, x, match) copies = _chain( x_backward_renames, diff --git a/tests/test-copies.t b/tests/test-copies.t --- a/tests/test-copies.t +++ b/tests/test-copies.t @@ -398,11 +398,8 @@ x -> y $ hg debugp1copies -r 2 x -> y -BROKEN: These two should not report any copies $ hg debugpathcopies 1 2 - x -> y $ hg debugpathcopies 2 1 - x -> y Copy x to y on one side of merge, create y and rename to z on the other side. $ newrepo diff --git a/tests/test-graft.t b/tests/test-graft.t --- a/tests/test-graft.t +++ b/tests/test-graft.t @@ -223,10 +223,6 @@ committing changelog updating the branch cache grafting 5:97f8bfe72746 "5" - all copies found (* = to merge, ! = divergent, % = renamed and deleted): - on local side: - src: 'c' -> dst: 'b' - checking for directory renames resolving manifests branchmerge: True, force: True, partial: False ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 @@ -240,10 +236,6 @@ $ HGEDITOR=cat hg graft 4 3 --log --debug scanning for duplicate grafts grafting 4:9c233e8e184d "4" - all copies found (* = to merge, ! = divergent, % = renamed and deleted): - on local side: - src: 'c' -> dst: 'b' - checking for directory renames resolving manifests branchmerge: True, force: True, partial: False ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d