Submitter | Pierre-Yves David |
---|---|
Date | Sept. 25, 2013, 9:26 p.m. |
Message ID | <b85be8af20fcedd3127f.1380144410@vulgaris> |
Download | mbox | patch |
Permalink | /patch/2636/ |
State | Accepted |
Commit | f72b513ad234a3c3e56b025a6e7febbb0e3cc828 |
Headers | show |
Comments
Patch
diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -1109,11 +1109,13 @@ class queue(object): wlock = repo.wlock() lock = repo.lock() if update: checklocalchanges(repo, force=force) - urev = self.qparents(repo, revs[0]) + urev, p2 = repo.changelog.parents(revs[0]) + if p2 != nullid and p2 in [x.node for x in self.applied]: + urev = p2 hg.clean(repo, urev) repo.dirstate.write() repair.strip(self.ui, repo, revs, backup) finally: