equal
deleted
inserted
replaced
807 "(see hg resolve)")) |
807 "(see hg resolve)")) |
808 |
808 |
809 wctx = context.workingctx(self, (p1, p2), text, user, date, |
809 wctx = context.workingctx(self, (p1, p2), text, user, date, |
810 extra, changes) |
810 extra, changes) |
811 if editor: |
811 if editor: |
812 wctx._text = editor(self, wctx, |
812 wctx._text = editor(self, wctx) |
813 changes[1], changes[0], changes[2]) |
|
814 ret = self.commitctx(wctx, True) |
813 ret = self.commitctx(wctx, True) |
815 |
814 |
816 # update dirstate and mergestate |
815 # update dirstate and mergestate |
817 for f in changes[0] + changes[1]: |
816 for f in changes[0] + changes[1]: |
818 self.dirstate.normal(f) |
817 self.dirstate.normal(f) |