--- a/mercurial/merge.py Sat Feb 20 15:27:11 2016 -0800
+++ b/mercurial/merge.py Sat Feb 20 15:54:09 2016 -0800
@@ -1058,7 +1058,7 @@
wwrite = repo.wwrite
ui = repo.ui
i = 0
- if True:
+ with repo.wvfs.backgroundclosing(ui, expectedcount=len(actions)):
for f, (flags, backup), msg in actions:
repo.ui.debug(" %s: %s -> g\n" % (f, msg))
if verbose:
@@ -1077,7 +1077,7 @@
if e.errno != errno.ENOENT:
raise
- wwrite(f, fctx(f).data(), flags)
+ wwrite(f, fctx(f).data(), flags, backgroundclose=True)
if i == 100:
yield i, f
i = 0