# HG changeset patch # User Raphaël Gomès # Date 2022-04-12 14:24:25 # Node ID 7241b3721ba575667afe03f59cae465972ea5927 # Parent c6c1caf283491944f0c128cee03c8e9803648495 rust-dirstatemap: stop using `.state` in `is_from_other_parent` This is a deprecated API and will be removed one day. Differential Revision: https://phab.mercurial-scm.org/D12537 diff --git a/rust/hg-core/src/dirstate/entry.rs b/rust/hg-core/src/dirstate/entry.rs --- a/rust/hg-core/src/dirstate/entry.rs +++ b/rust/hg-core/src/dirstate/entry.rs @@ -655,8 +655,7 @@ impl DirstateEntry { } pub(crate) fn is_from_other_parent(&self) -> bool { - self.state() == EntryState::Normal - && self.size() == SIZE_FROM_OTHER_PARENT + self.flags.contains(Flags::WDIR_TRACKED | Flags::P2_INFO) } // TODO: other platforms