Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rust/hg-core/src/dirstate_tree/dispatch.rs
changeset 47511 eaae39894312
parent 47491 8851acad5906
child 47521 abed645b8e96 
--- a/rust/hg-core/src/dirstate_tree/dispatch.rs	Sat Jul 03 20:12:46 2021 +0200
+++ b/rust/hg-core/src/dirstate_tree/dispatch.rs	Sat Jul 03 19:52:00 2021 +0200
@@ -61,8 +61,7 @@
     fn remove_file(
         &mut self,
         filename: &HgPath,
-        old_state: EntryState,
-        size: i32,
+        in_merge: bool,
     ) -> Result<(), DirstateError>;
 
     /// Drop information about this file from the map if any, and return
@@ -295,10 +294,9 @@
     fn remove_file(
         &mut self,
         filename: &HgPath,
-        old_state: EntryState,
-        size: i32,
+        in_merge: bool,
     ) -> Result<(), DirstateError> {
-        self.remove_file(filename, old_state, size)
+        self.remove_file(filename, in_merge)
     }
 
     fn drop_file(
mercurial