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