mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
merge: flush any deferred writes just before recordupdates()
``recordupdates`` calls into the dirstate which requires the files to be there, so this is the last possible moment we can flush anything. Differential Revision: https://phab.mercurial-scm.org/D673
This commit is contained in:
parent
0e9cb373ec
commit
b481a15354
@ -1712,6 +1712,7 @@ def update(repo, node, branchmerge, force, ancestor=None,
|
||||
repo.vfs.write('updatestate', p2.hex())
|
||||
|
||||
stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels)
|
||||
wc.flushall()
|
||||
|
||||
if not partial:
|
||||
with repo.dirstate.parentchange():
|
||||
|
Loading…
Reference in New Issue
Block a user