equal
deleted
inserted
replaced
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. |