diff -r 1e5b38a919dd -r cd79d9ab5e42 mercurial/commands.py
--- a/mercurial/commands.py	Wed Nov 06 16:48:06 2013 -0500
+++ b/mercurial/commands.py	Wed Nov 06 22:09:15 2013 -0500
@@ -3761,12 +3761,12 @@
                                         files, eolmode=None)
                     except patch.PatchError, e:
                         raise util.Abort(str(e))
-                    memctx = patch.makememctx(repo, (p1.node(), p2.node()),
-                                              message,
-                                              opts.get('user') or user,
-                                              opts.get('date') or date,
-                                              branch, files, store,
-                                              editor=cmdutil.commiteditor)
+                    memctx = context.makememctx(repo, (p1.node(), p2.node()),
+                                                message,
+                                                opts.get('user') or user,
+                                                opts.get('date') or date,
+                                                branch, files, store,
+                                                editor=cmdutil.commiteditor)
                     repo.savecommitmessage(memctx.description())
                     n = memctx.commit()
                 finally: