diff -r 8e72f9152c4d -r 010179e21e91 mercurial/context.py
--- a/mercurial/context.py	Wed Dec 06 22:56:15 2017 -0500
+++ b/mercurial/context.py	Fri Dec 01 00:07:23 2017 -0800
@@ -2129,7 +2129,7 @@
     def cmp(self, fctx):
         return self.data() != fctx.data()
 
-    def ctx(self):
+    def changectx(self):
         return self._parent
 
     def data(self):