Submitter | phabricator |
---|---|
Date | Dec. 21, 2020, 10:29 p.m. |
Message ID | <differential-rev-PHID-DREV-fw5awpko3bembspiq4k6-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/47965/ |
State | Superseded |
Headers | show |
Comments
Patch
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 @@ -570,7 +570,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()); } }