graft: fix duplicate filter logic

This commit is contained in:
Matt Mackall 2011-10-24 16:57:14 -05:00
parent 0d1e03e15b
commit b7f097bf54

View File

@ -2553,8 +2553,9 @@ def graft(ui, repo, *revs, **opts):
n = ctx.extra().get('source')
if n and n in repo:
r = repo[n].rev()
ui.warn(_('skipping already grafted revision %s\n') % r)
revs.remove(r)
if r in revs:
ui.warn(_('skipping already grafted revision %s\n') % r)
revs.remove(r)
if not revs:
return -1