changeset 7848 | 89e05c02a4af |
parent 7814 | 4421abf8c85d |
child 7875 | 553aa0cbeab6 |
child 7929 | 47b0a881638f |
--- a/mercurial/localrepo.py Mon Mar 16 16:58:41 2009 -0500 +++ b/mercurial/localrepo.py Mon Mar 16 16:58:41 2009 -0500 @@ -824,8 +824,11 @@ "(see hg resolve)")) wctx = context.workingctx(self, (p1, p2), text, user, date, extra, changes) - return self._commitctx(wctx, force, force_editor, empty_ok, - use_dirstate, update_dirstate) + r = self._commitctx(wctx, force, force_editor, empty_ok, + use_dirstate, update_dirstate) + ms.reset() + return r + finally: del lock, wlock