equal
deleted
inserted
replaced
92 Flags::P1_TRACKED |
92 Flags::P1_TRACKED |
93 }, |
93 }, |
94 mode_size: None, |
94 mode_size: None, |
95 mtime: None, |
95 mtime: None, |
96 }, |
96 }, |
97 EntryState::Merged => Self::new_merged(), |
97 EntryState::Merged => Self { |
|
98 flags: Flags::WDIR_TRACKED |
|
99 | Flags::P1_TRACKED // might not be true because of rename ? |
|
100 | Flags::P2_INFO, // might not be true because of rename ? |
|
101 mode_size: None, |
|
102 mtime: None, |
|
103 }, |
98 } |
104 } |
99 } |
105 } |
100 |
106 |
101 pub fn new_from_p2() -> Self { |
107 pub fn new_from_p2() -> Self { |
102 Self { |
108 Self { |