mercurial/localrepo.py

8706:25e9c71b89de

                                                    "(see hg resolve)"))

            wctx = context.workingctx(self, (p1, p2), text, user, date,
                                      extra, changes)
            if editor:
                wctx._text = editor(self, wctx,
                                    changes[1], changes[0], changes[2])
            ret = self.commitctx(wctx, True)

            # update dirstate and mergestate
            for f in changes[0] + changes[1]:
                self.dirstate.normal(f)

8707:0550dfe4fca1

                                                    "(see hg resolve)"))

            wctx = context.workingctx(self, (p1, p2), text, user, date,
                                      extra, changes)
            if editor:
                wctx._text = editor(self, wctx)
            ret = self.commitctx(wctx, True)

            # update dirstate and mergestate
            for f in changes[0] + changes[1]:
                self.dirstate.normal(f)