Mercurial > hg

diff rust/hg-cpython/src/dirstate/dispatch.rs @ 47527:c6b91a9c242a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: use a `merged` parameter to _addpath Differential Revision: https://phab.mercurial-scm.org/D10969
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 04 Jul 2021 01:48:11 +0200
parents fe4641cf9b72
children 6025353c9c55
line wrap: on
line diff
--- a/rust/hg-cpython/src/dirstate/dispatch.rs	Sun Jul 04 01:44:43 2021 +0200
+++ b/rust/hg-cpython/src/dirstate/dispatch.rs	Sun Jul 04 01:48:11 2021 +0200
@@ -26,6 +26,7 @@
         filename: &HgPath,
         entry: DirstateEntry,
         added: bool,
+        merged: bool,
         from_p2: bool,
         possibly_dirty: bool,
     ) -> Result<(), DirstateError> {
@@ -33,6 +34,7 @@
             filename,
             entry,
             added,
+            merged,
             from_p2,
             possibly_dirty,
         )