Show More
@@ -383,8 +383,10 b' def _combine_changeset_copies(' | |||||
383 |
|
383 | |||
384 | if copies is None: |
|
384 | if copies is None: | |
385 | # this is a root |
|
385 | # this is a root | |
386 | copies = {} |
|
386 | newcopies = copies = {} | |
387 |
|
387 | elif remaining_children: | ||
|
388 | newcopies = copies.copy() | |||
|
389 | else: | |||
388 | newcopies = copies |
|
390 | newcopies = copies | |
389 | # chain the data in the edge with the existing data |
|
391 | # chain the data in the edge with the existing data | |
390 | if changes is not None: |
|
392 | if changes is not None: | |
@@ -403,8 +405,6 b' def _combine_changeset_copies(' | |||||
403 | newcopies[dest] = (current_rev, source) |
|
405 | newcopies[dest] = (current_rev, source) | |
404 | assert newcopies is not copies |
|
406 | assert newcopies is not copies | |
405 | if changes.removed: |
|
407 | if changes.removed: | |
406 | if newcopies is copies: |
|
|||
407 | newcopies = copies.copy() |
|
|||
408 | for f in changes.removed: |
|
408 | for f in changes.removed: | |
409 | if f in newcopies: |
|
409 | if f in newcopies: | |
410 | if newcopies is copies: |
|
410 | if newcopies is copies: | |
@@ -417,9 +417,6 b' def _combine_changeset_copies(' | |||||
417 | # that child). See comment below for details. |
|
417 | # that child). See comment below for details. | |
418 | if current_copies is None: |
|
418 | if current_copies is None: | |
419 | current_copies = newcopies |
|
419 | current_copies = newcopies | |
420 | elif current_copies is newcopies: |
|
|||
421 | # nothing to merge: |
|
|||
422 | pass |
|
|||
423 | else: |
|
420 | else: | |
424 | # we are the second parent to work on c, we need to merge our |
|
421 | # we are the second parent to work on c, we need to merge our | |
425 | # work with the other. |
|
422 | # work with the other. |
General Comments 0
You need to be logged in to leave comments.
Login now