diff -r fd5247a88e63 mercurial/context.py
--- a/mercurial/context.py	Tue Nov 11 20:32:10 2014 -0800
+++ b/mercurial/context.py	Wed Nov 26 16:43:34 2014 -0600
@@ -1037,15 +1037,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