diff -r bf1d5c223ac0 -r b7af616ca675 mercurial/context.py
--- a/mercurial/context.py	Fri Jan 29 14:53:44 2016 -0500
+++ b/mercurial/context.py	Wed Feb 03 17:44:11 2016 -0800
@@ -1892,9 +1892,9 @@
             p2node = nullid
             p = pctx[f].parents() # if file isn't in pctx, check p2?
             if len(p) > 0:
-                p1node = p[0].node()
+                p1node = p[0].filenode()
                 if len(p) > 1:
-                    p2node = p[1].node()
+                    p2node = p[1].filenode()
             man[f] = revlog.hash(self[f].data(), p1node, p2node)
 
         for f in self._status.added: