##// END OF EJS Templates
rust-dirstatemap: stop using `.state` in `is_from_other_parent`...
Raphaël Gomès -
r50030:7241b372 default
parent child Browse files
Show More
@@ -655,8 +655,7 b' impl DirstateEntry {'
655 }
655 }
656
656
657 pub(crate) fn is_from_other_parent(&self) -> bool {
657 pub(crate) fn is_from_other_parent(&self) -> bool {
658 self.state() == EntryState::Normal
658 self.flags.contains(Flags::WDIR_TRACKED | Flags::P2_INFO)
659 && self.size() == SIZE_FROM_OTHER_PARENT
660 }
659 }
661
660
662 // TODO: other platforms
661 // TODO: other platforms
General Comments 0
You need to be logged in to leave comments. Login now