hgext/mq.py

--- a/hgext/mq.py	Mon Apr 07 23:10:20 2014 +0200
+++ b/hgext/mq.py	Mon Apr 07 23:10:20 2014 +0200
@@ -826,10 +826,10 @@
                 repo.setparents(p1, merge)
 
             if all_files and '.hgsubstate' in all_files:
-                wctx = repo['.']
-                mctx = actx = repo[None]
+                wctx = repo[None]
+                pctx = repo['.']
                 overwrite = False
-                mergedsubstate = subrepo.submerge(repo, wctx, mctx, actx,
+                mergedsubstate = subrepo.submerge(repo, pctx, wctx, wctx,
                     overwrite)
                 files += mergedsubstate.keys()