--- a/mercurial/revset.py	Sun Oct 22 17:23:34 2017 +0900
+++ b/mercurial/revset.py	Thu Sep 22 17:48:46 2016 +0900
@@ -929,11 +929,9 @@
 
         s = set()
         for fname in files:
-            fctx = c[fname]
+            fctx = c[fname].introfilectx()
             a = dagop.filectxancestors(fctx, followfirst)
             s = s.union(set(c.rev() for c in a))
-            # include the revision responsible for the most recent version
-            s.add(fctx.introrev())
     else:
         s = dagop.revancestors(repo, baseset([c.rev()]), followfirst)