Patchwork D7465: filemerge: fix a missing attribute usage

login
register
mail settings
Submitter phabricator
Date Dec. 1, 2019, 9:58 p.m.
Message ID <d339cbb134a1e08a6ba01091cb592ce4@localhost.localdomain>
Download mbox | patch
Permalink /patch/43551/
State Not Applicable
Headers show

Comments

phabricator - Dec. 1, 2019, 9:58 p.m.
mharbison72 updated this revision to Diff 18415.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7465?vs=18255&id=18415

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7465/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7465

AFFECTED FILES
  mercurial/filemerge.py

CHANGE DETAILS




To: mharbison72, #hg-reviewers
Cc: dlax, mercurial-devel

Patch

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -119,7 +119,7 @@ 
         """
         return not (
             fctx.isabsent()
-            and fctx.ctx() == self.ctx()
+            and fctx.changectx() == self.changectx()
             and fctx.path() == self.path()
         )