diff -r b76d54b90dc9 -r 69a463a4f193 rust/hg-core/src/dirstate_tree/dirstate_map.rs
--- a/rust/hg-core/src/dirstate_tree/dirstate_map.rs	Sat Jul 03 20:57:44 2021 +0200
+++ b/rust/hg-core/src/dirstate_tree/dirstate_map.rs	Sat Jul 03 20:59:26 2021 +0200
@@ -721,7 +721,6 @@
     fn add_file(
         &mut self,
         filename: &HgPath,
-        old_state: EntryState,
         entry: DirstateEntry,
         from_p2: bool,
         possibly_dirty: bool,
@@ -744,6 +743,11 @@
             entry.mtime = entry.mtime & V1_RANGEMASK;
         }
 
+        let old_state = match self.get(filename)? {
+            Some(e) => e.state,
+            None => EntryState::Unknown,
+        };
+
         Ok(self.add_or_remove_file(filename, old_state, entry)?)
     }