This revision was automatically updated to reflect the committed changes.
Closed by commit rHG57dc78d757ff: merge: flush any deferred writes just before
recordupdates() (authored by phillco, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
phillco updated this revision to Diff 1728.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D673?vs=1703=1728
REVISION DETAIL
https://phab.mercurial-scm.org/D673
AFFECTED FILES
mercurial/merge.py
CHANGE DETAILS
diff --git a/mercurial/merge.py
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
``recordupdates`` calls into the dirstate which requires the files to be
there, so this is the last possible moment we can flush anything.
REPOSITORY
rHG
