Mercurial > hg

changeset 20959:b6e0616d08cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: repo['.'] is not a wctx, repo[None] is The parameters passed to subrepo.submerge are confusing anyway.
author Mads Kiilerich <madski@unity3d.com>
date Mon, 07 Apr 2014 23:10:20 +0200
parents df33c9014430
children 8e5b21ce8ee9
files hgext/mq.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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()