[Updated] D11319: rust-dirstatemap: temporarily use `from_v1_data` in `addfile`

[marmoute (Pierre-Yves David)]

Closed by commit rHG226c7dbeea11: rust-dirstatemap: temporarily use `from_v1_data` in `addfile` (authored by marmoute).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D11319?vs=30045&id=30087

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11319/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D11319

AFFECTED FILES
  mercurial/dirstatemap.py

CHANGE DETAILS

diff --git a/mercurial/dirstatemap.py b/mercurial/dirstatemap.py
--- a/mercurial/dirstatemap.py
+++ b/mercurial/dirstatemap.py
@@ -615,7 +615,7 @@
                 )
             elif (p1_tracked or p2_tracked) and not wc_tracked:
                 # XXX might be merged and removed ?
-                self[filename] = DirstateItem(b'r', 0, 0, 0)
+                self[filename] = DirstateItem.from_v1_data(b'r', 0, 0, 0)
                 self.nonnormalset.add(filename)
             elif clean_p2 and wc_tracked:
                 if p1_tracked or self.get(filename) is not None:



To: marmoute, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210827/f996373a/attachment-0002.html>