comparison mercurial/localrepo.py @ 7848:89e05c02a4af

resolve: move reset to localrepo.commit

This way rebase doesn't leave a stale resolve state

7847:30cb79d84352

                if f in ms and ms[f] == 'u':
                    raise util.Abort(_("unresolved merge conflicts "
                                                    "(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)
        finally:
            del lock, wlock

    def commitctx(self, ctx):
        """Add a new revision to current repository.

7848:89e05c02a4af

                if f in ms and ms[f] == 'u':
                    raise util.Abort(_("unresolved merge conflicts "
                                                    "(see hg resolve)"))
            wctx = context.workingctx(self, (p1, p2), text, user, date,
                                      extra, changes)
            r = self._commitctx(wctx, force, force_editor, empty_ok,
                                use_dirstate, update_dirstate)
            ms.reset()
            return r

        finally:
            del lock, wlock

    def commitctx(self, ctx):
        """Add a new revision to current repository.