Submitter | phabricator |
---|---|
Date | June 24, 2019, 6:59 p.m. |
Message ID | <8e47fe1eb1fbee17136470e9a4296e9c@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/40666/ |
State | Not Applicable |
Headers | show |
Comments
Patch
diff --git a/mercurial/copies.py b/mercurial/copies.py --- a/mercurial/copies.py +++ b/mercurial/copies.py @@ -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