##// END OF EJS Templates
merge: drop reference to file contents immediately after write...
Mads Kiilerich -
r18335:435909bf default
parent child Browse files
Show More
@@ -405,9 +405,7 b' def applyupdates(repo, actions, wctx, mc'
405 405 elif m == "g": # get
406 406 flags = a[2]
407 407 repo.ui.note(_("getting %s\n") % f)
408 t = mctx.filectx(f).data()
409 repo.wwrite(f, t, flags)
410 t = None
408 repo.wwrite(f, mctx.filectx(f).data(), flags)
411 409 updated += 1
412 410 if f == '.hgsubstate': # subrepo states need updating
413 411 subrepo.submerge(repo, wctx, mctx, wctx, overwrite)
@@ -416,13 +414,11 b' def applyupdates(repo, actions, wctx, mc'
416 414 if f:
417 415 repo.ui.note(_("moving %s to %s\n") % (f, fd))
418 416 audit(f)
419 t = wctx.filectx(f).data()
420 repo.wwrite(fd, t, flags)
417 repo.wwrite(fd, wctx.filectx(f).data(), flags)
421 418 util.unlinkpath(repo.wjoin(f))
422 419 if f2:
423 420 repo.ui.note(_("getting %s to %s\n") % (f2, fd))
424 t = mctx.filectx(f2).data()
425 repo.wwrite(fd, t, flags)
421 repo.wwrite(fd, mctx.filectx(f2).data(), flags)
426 422 updated += 1
427 423 elif m == "dr": # divergent renames
428 424 fl = a[2]
General Comments 0
You need to be logged in to leave comments. Login now