Show More
@@ -312,15 +312,15 b' def _changesetforwardcopies(a, b, match)' | |||||
312 | if match(dst)} |
|
312 | if match(dst)} | |
313 | # Copy the dict only if later iterations will also need it |
|
313 | # Copy the dict only if later iterations will also need it | |
314 | if i != len(children[r]) - 1: |
|
314 | if i != len(children[r]) - 1: | |
315 | copies = copies.copy() |
|
315 | newcopies = copies.copy() | |
316 | if childcopies: |
|
|||
317 | childcopies = _chain(copies, childcopies) |
|
|||
318 | else: |
|
316 | else: | |
319 |
|
|
317 | newcopies = copies | |
|
318 | if childcopies: | |||
|
319 | newcopies = _chain(newcopies, childcopies) | |||
320 | for f in childctx.filesremoved(): |
|
320 | for f in childctx.filesremoved(): | |
321 |
if f in |
|
321 | if f in newcopies: | |
322 |
del |
|
322 | del newcopies[f] | |
323 |
heapq.heappush(work, (c, parent, |
|
323 | heapq.heappush(work, (c, parent, newcopies)) | |
324 | assert False |
|
324 | assert False | |
325 |
|
325 | |||
326 | def _forwardcopies(a, b, match=None): |
|
326 | def _forwardcopies(a, b, match=None): |
General Comments 0
You need to be logged in to leave comments.
Login now