Show More
@@ -476,27 +476,27 b' def _merge_copies_dict(minor, major, isa' | |||
|
476 | 476 | return minor |
|
477 | 477 | |
|
478 | 478 | |
|
479 |
def _compare_values(changes, isancestor, dest, o |
|
|
479 | def _compare_values(changes, isancestor, dest, minor, major): | |
|
480 | 480 | """compare two value within a _merge_copies_dict loop iteration""" |
|
481 |
|
|
|
482 |
o |
|
|
481 | major_tt = major[0] | |
|
482 | minor_tt = minor[0] | |
|
483 | 483 | |
|
484 |
if |
|
|
484 | if major[1] == minor[1]: | |
|
485 | 485 | return PICK_EITHER |
|
486 | 486 | # content from "major" wins, unless it is older |
|
487 | 487 | # than the branch point or there is a merge |
|
488 |
if |
|
|
488 | if major_tt == minor_tt: | |
|
489 | 489 | return PICK_MAJOR |
|
490 |
elif changes is not None and |
|
|
490 | elif changes is not None and major[1] is None and dest in changes.salvaged: | |
|
491 | 491 | return PICK_MINOR |
|
492 |
elif changes is not None and o |
|
|
492 | elif changes is not None and minor[1] is None and dest in changes.salvaged: | |
|
493 | 493 | return PICK_MAJOR |
|
494 | 494 | elif changes is not None and dest in changes.merged: |
|
495 | 495 | return PICK_MAJOR |
|
496 |
elif not isancestor( |
|
|
497 |
if |
|
|
496 | elif not isancestor(major_tt, minor_tt): | |
|
497 | if major[1] is not None: | |
|
498 | 498 | return PICK_MAJOR |
|
499 |
elif isancestor(o |
|
|
499 | elif isancestor(minor_tt, major_tt): | |
|
500 | 500 | return PICK_MAJOR |
|
501 | 501 | return PICK_MINOR |
|
502 | 502 |
General Comments 0
You need to be logged in to leave comments.
Login now