Show More
@@ -278,8 +278,6 b' def _changesetforwardcopies(a, b, match)' | |||||
278 | r, i2, copies2 = heapq.heappop(work) |
|
278 | r, i2, copies2 = heapq.heappop(work) | |
279 | copies = {} |
|
279 | copies = {} | |
280 | allcopies = set(copies1) | set(copies2) |
|
280 | allcopies = set(copies1) | set(copies2) | |
281 | # TODO: perhaps this filtering should be done as long as ctx |
|
|||
282 | # is merge, whether or not we're tracing from both parent. |
|
|||
283 | for dst in allcopies: |
|
281 | for dst in allcopies: | |
284 | if not alwaysmatch and not match(dst): |
|
282 | if not alwaysmatch and not match(dst): | |
285 | continue |
|
283 | continue |
General Comments 0
You need to be logged in to leave comments.
Login now