Show More
@@ -366,6 +366,9 b' def _combine_changeset_copies(' | |||||
366 | othercopies = all_copies.get(c) |
|
366 | othercopies = all_copies.get(c) | |
367 | if othercopies is None: |
|
367 | if othercopies is None: | |
368 | all_copies[c] = newcopies |
|
368 | all_copies[c] = newcopies | |
|
369 | elif newcopies is othercopies: | |||
|
370 | # nothing to merge: | |||
|
371 | pass | |||
369 | else: |
|
372 | else: | |
370 | # we are the second parent to work on c, we need to merge our |
|
373 | # we are the second parent to work on c, we need to merge our | |
371 | # work with the other. |
|
374 | # work with the other. |
General Comments 0
You need to be logged in to leave comments.
Login now