diff rust/hg-core/src/dirstate_tree/dispatch.rs @ 47527:c6b91a9c242a

dirstate: use a `merged` parameter to _addpath

Differential Revision: https://phab.mercurial-scm.org/D10969

--- a/rust/hg-core/src/dirstate_tree/dispatch.rs	Sun Jul 04 01:44:43 2021 +0200
+++ b/rust/hg-core/src/dirstate_tree/dispatch.rs	Sun Jul 04 01:48:11 2021 +0200
@@ -49,6 +49,7 @@
         filename: &HgPath,
         entry: DirstateEntry,
         added: bool,
+        merged: bool,
         from_p2: bool,
         possibly_dirty: bool,
     ) -> Result<(), DirstateError>;
@@ -289,10 +290,11 @@
         filename: &HgPath,
         entry: DirstateEntry,
         added: bool,
+        merged: bool,
         from_p2: bool,
         possibly_dirty: bool,
     ) -> Result<(), DirstateError> {
-        self.add_file(filename, entry, added, from_p2, possibly_dirty)
+        self.add_file(filename, entry, added, merged, from_p2, possibly_dirty)
     }
 
     fn remove_file(