Submitter | phabricator |
---|---|
Date | Dec. 7, 2017, 7:48 p.m. |
Message ID | <3ec852d10c4bb4ca94f11058550b5c7c@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/26005/ |
State | Not Applicable |
Headers | show |
Comments
Patch
diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -469,7 +469,7 @@ # calls might be depending on. from . import context if isinstance(fcd, context.overlayworkingfilectx): - fcd.ctx().flushall() + fcd.changectx().flushall() util.writefile(a + ".local", fcd.decodeddata()) repo.wwrite(fd + ".other", fco.data(), fco.flags()) diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -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):