##// END OF EJS Templates
rust: fix broken debug assertions...
Raphaël Gomès -
r50811:321e2b7b default
parent child Browse files
Show More
@@ -613,7 +613,7 b' fn compare_value('
613 // eventually.
613 // eventually.
614 (MergePick::Minor, true)
614 (MergePick::Minor, true)
615 } else if src_major.path == src_minor.path {
615 } else if src_major.path == src_minor.path {
616 debug_assert!(src_major.rev != src_major.rev);
616 debug_assert!(src_major.rev != src_minor.rev);
617 // we have the same value, but from other source;
617 // we have the same value, but from other source;
618 if src_major.is_overwritten_by(src_minor) {
618 if src_major.is_overwritten_by(src_minor) {
619 (MergePick::Minor, false)
619 (MergePick::Minor, false)
@@ -623,7 +623,7 b' fn compare_value('
623 (MergePick::Any, true)
623 (MergePick::Any, true)
624 }
624 }
625 } else {
625 } else {
626 debug_assert!(src_major.rev != src_major.rev);
626 debug_assert!(src_major.rev != src_minor.rev);
627 let action = merge_case_for_dest();
627 let action = merge_case_for_dest();
628 if src_minor.path.is_some()
628 if src_minor.path.is_some()
629 && src_major.path.is_none()
629 && src_major.path.is_none()
General Comments 0
You need to be logged in to leave comments. Login now