##// END OF EJS Templates
copies-rust: use simpler overwrite when value on both side are identical...
marmoute -
r47326:aa19d60a default
parent child Browse files
Show More
@@ -565,7 +565,11 b' fn chain_changes('
565 (Some(mut e1), Some(mut e2)) => {
565 (Some(mut e1), Some(mut e2)) => {
566 let cs1 = e1.get_mut();
566 let cs1 = e1.get_mut();
567 let cs2 = e2.get();
567 let cs2 = e2.get();
568 cs1.mark_delete_with_pair(current_rev, &cs2);
568 if cs1 == cs2 {
569 cs1.mark_delete(current_rev);
570 } else {
571 cs1.mark_delete_with_pair(current_rev, &cs2);
572 }
569 e2.insert(cs1.clone());
573 e2.insert(cs1.clone());
570 }
574 }
571 }
575 }
General Comments 0
You need to be logged in to leave comments. Login now