Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstatemap: use the default code to handle normal entry
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 16 Jul 2021 17:08:41 +0200
changeset 47929 442711f2c447
parent 47928 4f0ebf83e4dc
child 47930 625b6ddb828c
dirstatemap: use the default code to handle normal entry This case is quite simple. Differential Revision: https://phab.mercurial-scm.org/D11323
mercurial/dirstatemap.py file | annotate | diff | comparison | revisions 
--- a/mercurial/dirstatemap.py	Fri Jul 16 17:03:39 2021 +0200
+++ b/mercurial/dirstatemap.py	Fri Jul 16 17:08:41 2021 +0200
@@ -306,10 +306,6 @@
                 msg = b'failed to pass parentfiledata for a normal file: %s'
                 msg %= filename
                 raise error.ProgrammingError(msg)
-            mode, size, mtime = parentfiledata
-            self.addfile(filename, mode=mode, size=size, mtime=mtime)
-            self.nonnormalset.discard(filename)
-            return
         else:
             assert False, 'unreachable'
hg-stable