diff -r 33e5431684c0 -r 745e3b485632 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Wed Dec 31 17:55:43 2014 +0900
+++ b/mercurial/localrepo.py	Wed Dec 31 17:55:43 2014 +0900
@@ -1343,7 +1343,8 @@
                     elif f not in self.dirstate:
                         fail(f, _("file not tracked!"))
 
-            cctx = context.workingctx(self, text, user, date, extra, status)
+            cctx = context.workingcommitctx(self, status,
+                                            text, user, date, extra)
 
             if (not force and not extra.get("close") and not merge
                 and not cctx.files()