Show More
@@ -281,10 +281,13 b' def _changesetforwardcopies(a, b, match)' | |||||
281 | iterrevs &= mrset |
|
281 | iterrevs &= mrset | |
282 | iterrevs.update(roots) |
|
282 | iterrevs.update(roots) | |
283 | iterrevs.remove(b.rev()) |
|
283 | iterrevs.remove(b.rev()) | |
284 |
all_copies = { |
|
284 | all_copies = {} | |
285 | alwaysmatch = match.always() |
|
285 | alwaysmatch = match.always() | |
286 | for r in sorted(iterrevs): |
|
286 | for r in sorted(iterrevs): | |
287 | copies = all_copies.pop(r) |
|
287 | copies = all_copies.pop(r, None) | |
|
288 | if copies is None: | |||
|
289 | # this is a root | |||
|
290 | copies = {} | |||
288 | for i, c in enumerate(children[r]): |
|
291 | for i, c in enumerate(children[r]): | |
289 | p1, p2, p1copies, p2copies, removed = revinfo(c) |
|
292 | p1, p2, p1copies, p2copies, removed = revinfo(c) | |
290 | if r == p1: |
|
293 | if r == p1: |
General Comments 0
You need to be logged in to leave comments.
Login now