Mercurial > hg-stable
changeset 11755:7d2aaeea67ed stable
merge: drop reference to file contents after write
This reduces memory usage on large consecutive gets.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 05 Aug 2010 16:17:17 -0500 |
parents | 6ccd130eab0e |
children | 0299240b849b |
files | mercurial/merge.py |
diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Thu Aug 05 16:17:17 2010 -0500 +++ b/mercurial/merge.py Thu Aug 05 16:17:17 2010 -0500 @@ -323,6 +323,7 @@ repo.ui.note(_("getting %s\n") % f) t = mctx.filectx(f).data() repo.wwrite(f, t, flags) + t = None updated += 1 if f == '.hgsubstate': # subrepo states need updating subrepo.submerge(repo, wctx, mctx, wctx)