equal
deleted
inserted
replaced
835 for f in changes[0]: |
835 for f in changes[0]: |
836 if f in ms and ms[f] == 'u': |
836 if f in ms and ms[f] == 'u': |
837 raise util.Abort(_("unresolved merge conflicts " |
837 raise util.Abort(_("unresolved merge conflicts " |
838 "(see hg resolve)")) |
838 "(see hg resolve)")) |
839 |
839 |
840 wctx = context.workingctx(self, (p1, p2), text, user, date, |
840 cctx = context.workingctx(self, (p1, p2), text, user, date, |
841 extra, changes) |
841 extra, changes) |
842 if editor: |
842 if editor: |
843 wctx._text = editor(self, wctx) |
843 cctx._text = editor(self, cctx) |
844 ret = self.commitctx(wctx, True) |
844 ret = self.commitctx(cctx, True) |
845 |
845 |
846 # update dirstate and mergestate |
846 # update dirstate and mergestate |
847 for f in changes[0] + changes[1]: |
847 for f in changes[0] + changes[1]: |
848 self.dirstate.normal(f) |
848 self.dirstate.normal(f) |
849 for f in changes[2]: |
849 for f in changes[2]: |