D7465: filemerge: fix a missing attribute usage
mharbison72 (Matt Harbison)
phabricator at mercurial-scm.org
Sun Dec 1 21:58:40 UTC 2019
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
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()
)
To: mharbison72, #hg-reviewers
Cc: dlax, mercurial-devel
More information about the Mercurial-devel
mailing list