--- a/mercurial/copies.py Tue Jun 25 13:46:55 2019 -0700
+++ b/mercurial/copies.py Tue Jun 25 14:25:03 2019 -0700
@@ -285,7 +285,6 @@
# that side, even if it was also copied on the p2 side.
copies[dst] = copies2[dst]
if r == b.rev():
- _filter(a, b, copies)
return copies
for i, c in enumerate(children[r]):
childctx = repo[c]
@@ -321,7 +320,6 @@
cm = _committedforwardcopies(a, b.p1(), match)
# combine copies from dirstate if necessary
copies = _chain(cm, _dirstatecopies(b._repo, match))
- _filter(a, b, copies)
else:
copies = _committedforwardcopies(a, b, match)
return copies
@@ -373,7 +371,7 @@
repo.ui.debug('debug.copies: search mode: combined\n')
copies = _chain(_backwardrenames(x, a, match=match),
_forwardcopies(a, y, match=match))
- _filter(x, y, copies)
+ _filter(x, y, copies)
return copies
def mergecopies(repo, c1, c2, base):