branch | stable |
changeset 20009 | 2802bedbd45f |
parent 19945 | 3d42a85f6922 |
child 20096 | 88e172871ad7 |
child 20099 | 6284b0b16033 |
--- 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()