diff -r ccf4d808ec4c -r 6ed53b194124 mercurial/context.py
--- a/mercurial/context.py	Thu Oct 04 08:34:59 2018 +0200
+++ b/mercurial/context.py	Thu Oct 04 08:40:01 2018 +0200
@@ -776,10 +776,9 @@
         'linkrev-shadowing' when a file revision is used by multiple
         changesets.
         """
-        lkr = self.linkrev()
         attrs = vars(self)
         noctx = not (r'_changeid' in attrs or r'_changectx' in attrs)
-        if noctx or self.rev() == lkr:
+        if noctx:
             return self.linkrev()
         return self._adjustlinkrev(self.rev(), inclusive=True)