diff -r 8eb3408bf005 -r b946470efed9 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Sun Feb 10 23:01:12 2013 +0000
+++ b/mercurial/localrepo.py	Fri Feb 08 05:36:07 2013 -0800
@@ -1230,6 +1230,8 @@
                     elif f not in self.dirstate:
                         fail(f, _("file not tracked!"))
 
+            cctx = context.workingctx(self, text, user, date, extra, changes)
+
             if (not force and not extra.get("close") and not merge
                 and not (changes[0] or changes[1] or changes[2])
                 and wctx.branch() == wctx.p1().branch()):
@@ -1244,7 +1246,6 @@
                     raise util.Abort(_("unresolved merge conflicts "
                                        "(see hg help resolve)"))
 
-            cctx = context.workingctx(self, text, user, date, extra, changes)
             if editor:
                 cctx._text = editor(self, cctx, subs)
             edited = (text != cctx._text)