##// END OF EJS Templates
strip: stop calling `remove` on smartset...
Pierre-Yves David -
r22824:9271630f default
parent child Browse files
Show More
@@ -3381,10 +3381,12 b' def graft(ui, repo, *revs, **opts):'
3381 raise util.Abort(_('no revisions specified'))
3381 raise util.Abort(_('no revisions specified'))
3382 revs = scmutil.revrange(repo, revs)
3382 revs = scmutil.revrange(repo, revs)
3383
3383
3384 skipped = set()
3384 # check for merges
3385 # check for merges
3385 for rev in repo.revs('%ld and merge()', revs):
3386 for rev in repo.revs('%ld and merge()', revs):
3386 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3387 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3387 revs.remove(rev)
3388 skipped.add(rev)
3389 revs = [r for r in revs if r not in skipped]
3388 if not revs:
3390 if not revs:
3389 return -1
3391 return -1
3390
3392
General Comments 0
You need to be logged in to leave comments. Login now