--- a/mercurial/context.py Wed Nov 26 17:22:09 2014 +0300
+++ b/mercurial/context.py Wed Nov 26 14:54:16 2014 -0800
@@ -1063,15 +1063,16 @@
def _manifest(self):
"""generate a manifest corresponding to the values in self._status"""
- man = self._parents[0].manifest().copy()
+ man1 = self._parents[0].manifest()
+ man = man1.copy()
if len(self._parents) > 1:
man2 = self.p2().manifest()
def getman(f):
- if f in man:
- return man
+ if f in man1:
+ return man1
return man2
else:
- getman = lambda f: man
+ getman = lambda f: man1
copied = self._repo.dirstate.copies()
ff = self._flagfunc