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.
mercurial/dirstatemap.py
changeset 47894 226c7dbeea11
parent 47893 0b35bc0b8636
child 47896 d5b54917eb92 
--- a/mercurial/dirstatemap.py	Fri Jul 16 16:30:52 2021 +0200
+++ b/mercurial/dirstatemap.py	Fri Aug 20 22:35:52 2021 +0200
@@ -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:
mercurial