--- a/hgext/mq.py Mon Nov 22 17:32:51 2010 +0100
+++ b/hgext/mq.py Mon Nov 22 13:11:46 2010 -0600
@@ -1310,12 +1310,18 @@
# local dirstate. in this case, we want them to only
# show up in the added section
for x in m:
+ if x == '.hgsub' or x == '.hgsubstate':
+ self.ui.warn(_('warning: not refreshing %s\n') % x)
+ continue
if x not in aa:
mm.add(x)
# we might end up with files added by the local dirstate that
# were deleted by the patch. In this case, they should only
# show up in the changed section.
for x in a:
+ if x == '.hgsub' or x == '.hgsubstate':
+ self.ui.warn(_('warning: not adding %s\n') % x)
+ continue
if x in dd:
dd.remove(x)
mm.add(x)
@@ -1325,6 +1331,9 @@
# are not in the add or change column of the patch
forget = []
for x in d + r:
+ if x == '.hgsub' or x == '.hgsubstate':
+ self.ui.warn(_('warning: not removing %s\n') % x)
+ continue
if x in aa:
aa.remove(x)
forget.append(x)