[Commented On] D9655: copies-rust: use simpler overwrite when value on both side are identical
baymax (Baymax, Your Personal Patch-care Companion)
phabricator at mercurial-scm.org
Tue Jan 5 09:08:11 UTC 2021
baymax added a comment.
baymax updated this revision to Diff 24589.
â
refresh by Heptapod after a successful CI run (ð ð)
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D9655?vs=24505&id=24589
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D9655/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D9655
AFFECTED FILES
rust/hg-core/src/copy_tracing.rs
CHANGE DETAILS
diff --git a/rust/hg-core/src/copy_tracing.rs b/rust/hg-core/src/copy_tracing.rs
--- a/rust/hg-core/src/copy_tracing.rs
+++ b/rust/hg-core/src/copy_tracing.rs
@@ -572,7 +572,11 @@
(Some(mut e1), Some(mut e2)) => {
let cs1 = e1.get_mut();
let cs2 = e2.get();
- cs1.mark_delete_with_pair(current_rev, &cs2);
+ if cs1 == cs2 {
+ cs1.mark_delete(current_rev);
+ } else {
+ cs1.mark_delete_with_pair(current_rev, &cs2);
+ }
e2.insert(cs1.clone());
}
}
To: marmoute, #hg-reviewers
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20210105/ea4483b2/attachment.html>
More information about the Mercurial-patches
mailing list