Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip: fix last unprotected mq reference (issue4097) stable
authorMatt Mackall <mpm@selenic.com>
Thu, 14 Nov 2013 21:37:18 -0600
branchstable
changeset 20009 2802bedbd45f
parent 20005 22154ec6fb8b
child 20011 cb466830826a
strip: fix last unprotected mq reference (issue4097)
hgext/strip.py file | annotate | diff | comparison | revisions 
--- a/hgext/strip.py	Sat Nov 09 10:21:20 2013 +0100
+++ b/hgext/strip.py	Thu Nov 14 21:37:18 2013 -0600
@@ -51,7 +51,9 @@
         if update:
             checklocalchanges(repo, force=force)
             urev, p2 = repo.changelog.parents(revs[0])
-            if p2 != nullid and p2 in [x.node for x in repo.mq.applied]:
+            if (util.safehasattr(repo, 'mq') and
+                p2 != nullid
+                and p2 in [x.node for x in repo.mq.applied]):
                 urev = p2
             hg.clean(repo, urev)
             repo.dirstate.write()
hg-stable