D6361: overlayworkingctx: don't include added-then-deleted files in memctx
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed May 15 14:03:03 EDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe79aeb518aa1: overlayworkingctx: don'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
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,
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list