##// END OF EJS Templates
mq: drop the use of mq.queue.qparent in mq.queue.strip...
Pierre-Yves David -
r19818:f72b513a default
parent child Browse files
Show More
@@ -1111,7 +1111,9 b' class queue(object):'
1111
1111
1112 if update:
1112 if update:
1113 checklocalchanges(repo, force=force)
1113 checklocalchanges(repo, force=force)
1114 urev = self.qparents(repo, revs[0])
1114 urev, p2 = repo.changelog.parents(revs[0])
1115 if p2 != nullid and p2 in [x.node for x in self.applied]:
1116 urev = p2
1115 hg.clean(repo, urev)
1117 hg.clean(repo, urev)
1116 repo.dirstate.write()
1118 repo.dirstate.write()
1117
1119
General Comments 0
You need to be logged in to leave comments. Login now