Patchwork [4,of,6,misc] mq: repo['.'] is not a wctx, repo[None] is

login
register
mail settings
Submitter Mads Kiilerich
Date April 7, 2014, 9:11 p.m.
Message ID <645cf5d94000e9bd69a2.1396905096@mk-desktop>
Download mbox | patch
Permalink /patch/4249/
State Accepted
Commit b6e0616d08cb2426ec393eedc87eb94d9ee9b134
Headers show

Comments

Mads Kiilerich - April 7, 2014, 9:11 p.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1396905020 -7200
#      Mon Apr 07 23:10:20 2014 +0200
# Node ID 645cf5d94000e9bd69a291a611edc372a6ae527c
# Parent  6f9338816a38cacf8aeaa89059311b35752134bd
mq: repo['.'] is not a wctx, repo[None] is

The parameters passed to subrepo.submerge are confusing anyway.

Patch

diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -826,10 +826,10 @@  class queue(object):
                 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()