changeset 49139 | 7241b3721ba5 |
parent 49138 | c6c1caf28349 |
child 49373 | f8ec7b16c98f |
--- a/rust/hg-core/src/dirstate/entry.rs Tue Apr 12 17:29:21 2022 +0200 +++ b/rust/hg-core/src/dirstate/entry.rs Tue Apr 12 16:24:25 2022 +0200 @@ -655,8 +655,7 @@ } 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