hgext/mq.py
changeset 20827 ca5dd216cb62
parent 20790 49f2d5644f04
child 20924 e10000369b47
--- a/hgext/mq.py	Sat Mar 22 14:46:55 2014 -0500
+++ b/hgext/mq.py	Sat Mar 22 23:39:51 2014 +0900
@@ -1048,7 +1048,7 @@
             changes = self.checklocalchanges(repo, force=True)
         commitfiles = list(inclsubs)
         for files in changes[:3]:
-            commitfiles.extend([f for f in files if f != '.hgsubstate'])
+            commitfiles.extend(files)
         match = scmutil.matchfiles(repo, commitfiles)
         if len(repo[None].parents()) > 1:
             raise util.Abort(_('cannot manage merge changesets'))
@@ -1577,7 +1577,7 @@
 
             files = set(inclsubs)
             for x in refreshchanges:
-                files.update([f for f in x if f != '.hgsubstate'])
+                files.update(x)
             match = scmutil.matchfiles(repo, files)
 
             bmlist = repo[top].bookmarks()