branch | stable |
changeset 11755 | 7d2aaeea67ed |
parent 11716 | db426935fa94 |
child 11759 | 05deba16c5d5 |
child 12008 | fad5ed0ff997 |
--- 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)