Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 11755:7d2aaeea67ed stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 db426935fa94
children 05deba16c5d5 fad5ed0ff997
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)