Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: fix a missing attribute usage
authorMatt Harbison <matt_harbison@yahoo.com>
Wed, 20 Nov 2019 13:03:22 -0500
changeset 43846 d5ce99a6db52
parent 43845 1ffbd03c8d75
child 43847 49fa0b31ee1d
filemerge: fix a missing attribute usage Flagged by both pytype and VSCode. Differential Revision: https://phab.mercurial-scm.org/D7465
mercurial/filemerge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/filemerge.py	Wed Nov 20 13:01:56 2019 -0500
+++ b/mercurial/filemerge.py	Wed Nov 20 13:03:22 2019 -0500
@@ -119,7 +119,7 @@
         """
         return not (
             fctx.isabsent()
-            and fctx.ctx() == self.ctx()
+            and fctx.changectx() == self.changectx()
             and fctx.path() == self.path()
         )
Mercurial