--- a/mercurial/context.py	Mon Nov 19 21:11:08 2018 +0300
+++ b/mercurial/context.py	Mon Nov 19 23:08:09 2018 -0800
@@ -562,9 +562,7 @@
 
     @propertycache
     def _changeid(self):
-        if r'_changeid' in self.__dict__:
-            return self._changeid
-        elif r'_changectx' in self.__dict__:
+        if r'_changectx' in self.__dict__:
             return self._changectx.rev()
         elif r'_descendantrev' in self.__dict__:
             # this file context was created from a revision with a known