##// END OF EJS Templates
merge: drop reference to file contents after write...
Matt Mackall -
r11755:7d2aaeea stable
parent child Browse files
Show More
@@ -323,6 +323,7 b' def applyupdates(repo, action, wctx, mct'
323 323 repo.ui.note(_("getting %s\n") % f)
324 324 t = mctx.filectx(f).data()
325 325 repo.wwrite(f, t, flags)
326 t = None
326 327 updated += 1
327 328 if f == '.hgsubstate': # subrepo states need updating
328 329 subrepo.submerge(repo, wctx, mctx, wctx)
General Comments 0
You need to be logged in to leave comments. Login now