phillco updated this revision to Diff 1700.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D627?vs=1671=1700
REVISION DETAIL
https://phab.mercurial-scm.org/D627
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
quark added a comment.
As mentioned in the previous patch. I think it's cleaner to just call
`wctx.flushall()` if the other wctx class has that method.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D627
To: phillco, #hg-reviewers
Cc: quark, martinvonz,
phillco updated this revision to Diff 1671.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D627?vs=1668=1671
REVISION DETAIL
https://phab.mercurial-scm.org/D627
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
phillco updated this revision to Diff 1668.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D627?vs=1608=1668
REVISION DETAIL
https://phab.mercurial-scm.org/D627
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
martinvonz added inline comments.
INLINE COMMENTS
> filemerge.py:500-503
> +# Must flush any deferred contents if running a merge tool.
> +from . import context
> +if isinstance(wctx, context.overlayworkingctx):
> +wctx.flushall()
As Phil and I talked about out-of-band, it
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Since merge tools might read from the filesystem, we need to write out our
deferred writes here.
No-ops if not using deferred writes.
REPOSITORY
rHG
