Show More
@@ -2129,7 +2129,7 b' class overlayworkingfilectx(workingfilec' | |||||
2129 | def cmp(self, fctx): |
|
2129 | def cmp(self, fctx): | |
2130 | return self.data() != fctx.data() |
|
2130 | return self.data() != fctx.data() | |
2131 |
|
2131 | |||
2132 | def ctx(self): |
|
2132 | def changectx(self): | |
2133 | return self._parent |
|
2133 | return self._parent | |
2134 |
|
2134 | |||
2135 | def data(self): |
|
2135 | def data(self): |
@@ -469,7 +469,7 b' def _idump(repo, mynode, orig, fcd, fco,' | |||||
469 | # calls might be depending on. |
|
469 | # calls might be depending on. | |
470 | from . import context |
|
470 | from . import context | |
471 | if isinstance(fcd, context.overlayworkingfilectx): |
|
471 | if isinstance(fcd, context.overlayworkingfilectx): | |
472 | fcd.ctx().flushall() |
|
472 | fcd.changectx().flushall() | |
473 |
|
473 | |||
474 | util.writefile(a + ".local", fcd.decodeddata()) |
|
474 | util.writefile(a + ".local", fcd.decodeddata()) | |
475 | repo.wwrite(fd + ".other", fco.data(), fco.flags()) |
|
475 | repo.wwrite(fd + ".other", fco.data(), fco.flags()) |
General Comments 0
You need to be logged in to leave comments.
Login now