mercurial/context.py

--- a/mercurial/context.py	Fri Jan 30 16:02:28 2015 +0000
+++ b/mercurial/context.py	Sun Feb 01 16:23:07 2015 -0600
@@ -954,7 +954,7 @@
         cut = followfirst and 1 or None
         while True:
             for parent in c.parents()[:cut]:
-                visit[(parent.rev(), parent.node())] = parent
+                visit[(parent.linkrev(), parent.filenode())] = parent
             if not visit:
                 break
             c = visit.pop(max(visit))