##// END OF EJS Templates
overlayworkingctx: don't include added-then-deleted files in memctx...
Martin von Zweigbergk -
r42476:e79aeb51 default
parent child Browse files
Show More
@@ -2055,7 +2055,7 b' class overlayworkingctx(committablectx):'
2055 else:
2055 else:
2056 parents = (self._repo[parents[0]], self._repo[parents[1]])
2056 parents = (self._repo[parents[0]], self._repo[parents[1]])
2057
2057
2058 files = self._cache.keys()
2058 files = self.files()
2059 def getfile(repo, memctx, path):
2059 def getfile(repo, memctx, path):
2060 if self._cache[path]['exists']:
2060 if self._cache[path]['exists']:
2061 return memfilectx(repo, memctx, path,
2061 return memfilectx(repo, memctx, path,
General Comments 0
You need to be logged in to leave comments. Login now