--- a/rust/hg-cpython/src/dirstate/dispatch.rs	Sat Jul 03 20:12:46 2021 +0200
+++ b/rust/hg-cpython/src/dirstate/dispatch.rs	Sat Jul 03 19:52:00 2021 +0200
@@ -33,10 +33,9 @@
     fn remove_file(
         &mut self,
         filename: &HgPath,
-        old_state: EntryState,
-        size: i32,
+        in_merge: bool,
     ) -> Result<(), DirstateError> {
-        self.get_mut().remove_file(filename, old_state, size)
+        self.get_mut().remove_file(filename, in_merge)
     }
 
     fn drop_file(