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