--- a/mercurial/context.py	Fri Jul 25 20:20:26 2014 -0500
+++ b/mercurial/context.py	Tue Jun 17 20:55:06 2014 -0700
@@ -1645,7 +1645,7 @@
         for f, fnode in man.iteritems():
             p1node = nullid
             p2node = nullid
-            p = pctx[f].parents()
+            p = pctx[f].parents() # if file isn't in pctx, check p2?
             if len(p) > 0:
                 p1node = p[0].node()
                 if len(p) > 1: