Mercurial > public > mercurial-scm > hg-stable

diff hgext/mq.py @ 18342:de99de39ba28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: fix qpop of working directory parent patch when not at qtip mq assumed that it had to update from qtip to qparent, and instead of updating from where it was it failed with: abort: working directory revision is not qtip
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 15 Jan 2013 01:05:12 +0100
parents 46cc3b74e1c5
children cfa731b45b75
line wrap: on
line diff
--- a/hgext/mq.py	Tue Jan 15 01:05:12 2013 +0100
+++ b/hgext/mq.py	Tue Jan 15 01:05:12 2013 +0100
@@ -1406,8 +1406,6 @@
             self.applieddirty = True
             end = len(self.applied)
             rev = self.applied[start].node
-            if update:
-                top = self.checktoppatch(repo)[0]
 
             try:
                 heads = repo.changelog.heads(rev)
@@ -1428,7 +1426,7 @@
             if update:
                 qp = self.qparents(repo, rev)
                 ctx = repo[qp]
-                m, a, r, d = repo.status(qp, top)[:4]
+                m, a, r, d = repo.status(qp, '.')[:4]
                 if d:
                     raise util.Abort(_("deletions found between repo revs"))