hgext/mq.py
changeset 41373 b5f5dc0fa908
parent 40995 19178aeb9b43
child 41399 5cb8158a61f7
--- a/hgext/mq.py	Thu Jan 24 16:25:19 2019 -0800
+++ b/hgext/mq.py	Thu Jan 24 16:30:30 2019 -0800
@@ -3521,7 +3521,7 @@
             if self.mq.applied and self.mq.checkapplied and not force:
                 parents = self.dirstate.parents()
                 patches = [s.node for s in self.mq.applied]
-                if parents[0] in patches or parents[1] in patches:
+                if any(p in patches for p in parents):
                     raise error.Abort(errmsg)
 
         def commit(self, text="", user=None, date=None, match=None,