Show More
@@ -383,8 +383,8 b' def _combine_changeset_copies(' | |||
|
383 | 383 | minor, major = othercopies, newcopies |
|
384 | 384 | else: |
|
385 | 385 | minor, major = newcopies, othercopies |
|
386 | _merge_copies_dict(minor, major, isancestor, changes) | |
|
387 |
all_copies[c] = |
|
|
386 | copies = _merge_copies_dict(minor, major, isancestor, changes) | |
|
387 | all_copies[c] = copies | |
|
388 | 388 | |
|
389 | 389 | final_copies = {} |
|
390 | 390 | for dest, (tt, source) in all_copies[targetrev].items(): |
@@ -403,6 +403,8 b' def _merge_copies_dict(minor, major, isa' | |||
|
403 | 403 | |
|
404 | 404 | - `ismerged(path)`: callable return True if `path` have been merged in the |
|
405 | 405 | current revision, |
|
406 | ||
|
407 | return the resulting dict (in practice, the "minor" object, updated) | |
|
406 | 408 | """ |
|
407 | 409 | for dest, value in major.items(): |
|
408 | 410 | other = minor.get(dest) |
@@ -436,6 +438,7 b' def _merge_copies_dict(minor, major, isa' | |||
|
436 | 438 | minor[dest] = value |
|
437 | 439 | elif isancestor(other_tt, new_tt): |
|
438 | 440 | minor[dest] = value |
|
441 | return minor | |
|
439 | 442 | |
|
440 | 443 | |
|
441 | 444 | def _revinfo_getter_extra(repo): |
General Comments 0
You need to be logged in to leave comments.
Login now