Comments
Patch
@@ -1200,7 +1200,7 @@
elif f not in self.dirstate:
fail(f, _("file not tracked!"))
- cctx = context.workingctx(self, text, user, date, extra, changes)
+ cctx = context.workingctx(self, changes=changes)
if (not force and not extra.get("close") and not merge
and not cctx.files()
@@ -1214,6 +1214,11 @@
raise util.Abort(_("unresolved merge conflicts "
"(see hg help resolve)"))
+ cctx.setuser(user)
+ cctx.setdate(date)
+ cctx.setextra(extra)
+
+ cctx.setdescription(text)
if editor:
cctx.setdescription(editor(self, cctx, subs))
edited = (text != cctx.description())