diff -r 42ab0bcb6ded -r fb3b41d583c2 rust/hg-core/src/dirstate/entry.rs --- a/rust/hg-core/src/dirstate/entry.rs Fri Oct 01 02:01:12 2021 +0200 +++ b/rust/hg-core/src/dirstate/entry.rs Fri Oct 01 04:04:09 2021 +0200 @@ -161,6 +161,10 @@ self.in_either_parent() && !self.flags.contains(Flags::WDIR_TRACKED) } + pub fn p2_info(&self) -> bool { + self.flags.contains(Flags::WDIR_TRACKED | Flags::P2_INFO) + } + pub fn merged(&self) -> bool { self.flags .contains(Flags::WDIR_TRACKED | Flags::P1_TRACKED | Flags::P2_INFO)