--- a/mercurial/context.py	Thu Apr 16 17:30:01 2015 -0500
+++ b/mercurial/context.py	Thu Apr 16 18:30:08 2015 -0500
@@ -908,7 +908,7 @@
         introrev = self.introrev()
         if self.rev() != introrev:
             base = self.filectx(self.filenode(), changeid=introrev)
-        if getattr(base, '_ancestrycontext', None) is None:
+        if introrev and getattr(base, '_ancestrycontext', None) is None:
             ac = self._repo.changelog.ancestors([introrev], inclusive=True)
             base._ancestrycontext = ac