changeset 42517 | 8f9cfc8d2ae1 |
parent 42514 | e7c55e24d6bf |
child 42518 | c7104896ec42 |
--- a/mercurial/copies.py Mon Jun 24 14:28:21 2019 -0400 +++ b/mercurial/copies.py Thu Jun 20 10:51:23 2019 -0700 @@ -278,8 +278,6 @@ r, i2, copies2 = heapq.heappop(work) copies = {} allcopies = set(copies1) | set(copies2) - # TODO: perhaps this filtering should be done as long as ctx - # is merge, whether or not we're tracing from both parent. for dst in allcopies: if not alwaysmatch and not match(dst): continue