equal
deleted
inserted
replaced
870 "(see hg resolve)")) |
870 "(see hg resolve)")) |
871 |
871 |
872 cctx = context.workingctx(self, (p1, p2), text, user, date, |
872 cctx = context.workingctx(self, (p1, p2), text, user, date, |
873 extra, changes) |
873 extra, changes) |
874 if editor: |
874 if editor: |
875 cctx._text = editor(self, cctx) |
875 cctx._text = editor(self, cctx, subs) |
876 |
876 |
877 # commit subs |
877 # commit subs |
878 if subs: |
878 if subs: |
879 state = wctx.substate.copy() |
879 state = wctx.substate.copy() |
880 for s in subs: |
880 for s in subs: |