Show More
@@ -378,14 +378,11 b' def _combine_changeset_copies(' | |||||
378 | # changeset based copies. It was made without regards with |
|
378 | # changeset based copies. It was made without regards with | |
379 | # potential filelog related behavior. |
|
379 | # potential filelog related behavior. | |
380 | if parent == 1: |
|
380 | if parent == 1: | |
381 |
|
|
381 | minor, major = othercopies, newcopies | |
382 | othercopies, newcopies, isancestor, changes |
|
|||
383 | ) |
|
|||
384 | else: |
|
382 | else: | |
385 |
|
|
383 | minor, major = newcopies, othercopies | |
386 |
|
|
384 | _merge_copies_dict(minor, major, isancestor, changes) | |
387 |
|
|
385 | all_copies[c] = minor | |
388 | all_copies[c] = newcopies |
|
|||
389 |
|
386 | |||
390 | final_copies = {} |
|
387 | final_copies = {} | |
391 | for dest, (tt, source) in all_copies[targetrev].items(): |
|
388 | for dest, (tt, source) in all_copies[targetrev].items(): |
General Comments 0
You need to be logged in to leave comments.
Login now