Show More
@@ -645,7 +645,7 b' fn merge_copies_dict<A: Fn(Revision, Rev' | |||||
645 | } |
|
645 | } | |
646 | Some(src_minor) => { |
|
646 | Some(src_minor) => { | |
647 | let (pick, overwrite) = |
|
647 | let (pick, overwrite) = | |
648 |
cmp_value(oracle, &dest, &src_major |
|
648 | cmp_value(oracle, &dest, src_minor, &src_major); | |
649 | if overwrite { |
|
649 | if overwrite { | |
650 | oracle.record_overwrite(src_minor.rev, current_merge); |
|
650 | oracle.record_overwrite(src_minor.rev, current_merge); | |
651 | oracle.record_overwrite(src_major.rev, current_merge); |
|
651 | oracle.record_overwrite(src_major.rev, current_merge); | |
@@ -661,8 +661,8 b' fn merge_copies_dict<A: Fn(Revision, Rev' | |||||
661 | minor.insert(dest, src); |
|
661 | minor.insert(dest, src); | |
662 | } else { |
|
662 | } else { | |
663 | match pick { |
|
663 | match pick { | |
664 |
MergePick::Any | MergePick::M |
|
664 | MergePick::Any | MergePick::Minor => None, | |
665 |
MergePick::M |
|
665 | MergePick::Major => minor.insert(dest, src_major), | |
666 | }; |
|
666 | }; | |
667 | } |
|
667 | } | |
668 | } |
|
668 | } |
General Comments 0
You need to be logged in to leave comments.
Login now