--- a/rust/hg-core/src/dirstate_tree/dirstate_map.rs Sat Jul 03 20:59:26 2021 +0200
+++ b/rust/hg-core/src/dirstate_tree/dirstate_map.rs Sun Jul 04 01:42:10 2021 +0200
@@ -722,13 +722,15 @@
&mut self,
filename: &HgPath,
entry: DirstateEntry,
+ added: bool,
from_p2: bool,
possibly_dirty: bool,
) -> Result<(), DirstateError> {
let mut entry = entry;
- if entry.state == EntryState::Added {
+ if added {
assert!(!possibly_dirty);
assert!(!from_p2);
+ entry.state = EntryState::Added;
entry.size = SIZE_NON_NORMAL;
entry.mtime = MTIME_UNSET;
} else if from_p2 {