Patchwork D6361: overlayworkingctx: don't include added-then-deleted files in memctx

login
register
mail settings
Submitter phabricator
Date May 15, 2019, 6:03 p.m.
Message ID <66031ec3c45d18396f1eb79ce4e0c76e@localhost.localdomain>
Download mbox | patch
Permalink /patch/40049/
State Not Applicable
Headers show

Comments

phabricator - May 15, 2019, 6:03 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe79aeb518aa1: overlayworkingctx: don&#039;t include added-then-deleted files in memctx (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6361?vs=15054&id=15102

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

AFFECTED FILES
  mercurial/context.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -2055,7 +2055,7 @@ 
         else:
             parents = (self._repo[parents[0]], self._repo[parents[1]])
 
-        files = self._cache.keys()
+        files = self.files()
         def getfile(repo, memctx, path):
             if self._cache[path]['exists']:
                 return memfilectx(repo, memctx, path,