Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 7848:89e05c02a4af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: move reset to localrepo.commit This way rebase doesn't leave a stale resolve state
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Mar 2009 16:58:41 -0500
parents 4421abf8c85d
children 553aa0cbeab6 47b0a881638f
comparison
equal deleted inserted replaced
7847:30cb79d84352 7848:89e05c02a4af
822 if f in ms and ms[f] == 'u': 822 if f in ms and ms[f] == 'u':
823 raise util.Abort(_("unresolved merge conflicts " 823 raise util.Abort(_("unresolved merge conflicts "
824 "(see hg resolve)")) 824 "(see hg resolve)"))
825 wctx = context.workingctx(self, (p1, p2), text, user, date, 825 wctx = context.workingctx(self, (p1, p2), text, user, date,
826 extra, changes) 826 extra, changes)
827 return self._commitctx(wctx, force, force_editor, empty_ok, 827 r = self._commitctx(wctx, force, force_editor, empty_ok,
828 use_dirstate, update_dirstate) 828 use_dirstate, update_dirstate)
829 ms.reset()
830 return r
831
829 finally: 832 finally:
830 del lock, wlock 833 del lock, wlock
831 834
832 def commitctx(self, ctx): 835 def commitctx(self, ctx):
833 """Add a new revision to current repository. 836 """Add a new revision to current repository.