##// END OF EJS Templates
strip: fix last unprotected mq reference (issue4097)
Matt Mackall -
r20009:2802bedb stable
parent child Browse files
Show More
@@ -51,7 +51,9 b' def strip(ui, repo, revs, update=True, b'
51 if update:
51 if update:
52 checklocalchanges(repo, force=force)
52 checklocalchanges(repo, force=force)
53 urev, p2 = repo.changelog.parents(revs[0])
53 urev, p2 = repo.changelog.parents(revs[0])
54 if p2 != nullid and p2 in [x.node for x in repo.mq.applied]:
54 if (util.safehasattr(repo, 'mq') and
55 p2 != nullid
56 and p2 in [x.node for x in repo.mq.applied]):
55 urev = p2
57 urev = p2
56 hg.clean(repo, urev)
58 hg.clean(repo, urev)
57 repo.dirstate.write()
59 repo.dirstate.write()
General Comments 0
You need to be logged in to leave comments. Login now