diff hgext/mq.py @ 8433:9a398dd53bcc

mq: qpush shouldn't complain if working dir is at a non-tip head
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 15 May 2009 15:21:17 +0200
parents 0bf0045000b5
children 15573b5dc78f
line wrap: on
line diff
--- a/hgext/mq.py	Fri May 15 10:47:19 2009 +0200
+++ b/hgext/mq.py	Fri May 15 15:21:17 2009 +0200
@@ -885,8 +885,8 @@
     def push(self, repo, patch=None, force=False, list=False,
              mergeq=None, all=False):
         wlock = repo.wlock()
-        if repo.dirstate.parents()[0] != repo.changelog.tip():
-            self.ui.status(_("(working directory not at tip)\n"))
+        if repo.dirstate.parents()[0] not in repo.heads():
+            self.ui.status(_("(working directory not at a head)\n"))
 
         if not self.series:
             self.ui.warn(_('no patches in series\n'))