Show More
@@ -380,9 +380,14 b' def _combine_changeset_copies(' | |||||
380 | # changeset based copies. It was made without regards with |
|
380 | # changeset based copies. It was made without regards with | |
381 | # potential filelog related behavior. |
|
381 | # potential filelog related behavior. | |
382 | if parent == 1: |
|
382 | if parent == 1: | |
|
383 | if newcopies is copies: | |||
|
384 | newcopies = copies.copy() | |||
383 | minor, major = othercopies, newcopies |
|
385 | minor, major = othercopies, newcopies | |
384 | else: |
|
386 | else: | |
385 | minor, major = newcopies, othercopies |
|
387 | # we do not know if the other dict is a copy or not, so we | |
|
388 | # need to blindly copy it. Future change should make this | |||
|
389 | # unnecessary. | |||
|
390 | minor, major = newcopies, othercopies.copy() | |||
386 | copies = _merge_copies_dict(minor, major, isancestor, changes) |
|
391 | copies = _merge_copies_dict(minor, major, isancestor, changes) | |
387 | all_copies[c] = copies |
|
392 | all_copies[c] = copies | |
388 |
|
393 |
General Comments 0
You need to be logged in to leave comments.
Login now