##// END OF EJS Templates
mq: drop the use of mq.queue.qparent in mq.strip...
Pierre-Yves David -
r19817:e6778696 default
parent child Browse files
Show More
@@ -3062,7 +3062,9 b' def strip(ui, repo, *revs, **opts):'
3062 if update and opts.get('keep'):
3062 if update and opts.get('keep'):
3063 wlock = repo.wlock()
3063 wlock = repo.wlock()
3064 try:
3064 try:
3065 urev = repo.mq.qparents(repo, revs[0])
3065 urev, p2 = repo.changelog.parents(revs[0])
3066 if p2 != nullid and p2 in [x.node for x in repo.mq.applied]:
3067 urev = p2
3066 uctx = repo[urev]
3068 uctx = repo[urev]
3067
3069
3068 # only reset the dirstate for files that would actually change
3070 # only reset the dirstate for files that would actually change
General Comments 0
You need to be logged in to leave comments. Login now