Mercurial > hg-stable

changeset 15360:73628b32d0c0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: fix duplicate filter logic
author Matt Mackall <mpm@selenic.com>
date Mon, 24 Oct 2011 16:57:14 -0500
parents a5a8adf95e51
children c1930992e111
files mercurial/commands.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Oct 24 16:57:14 2011 -0500
+++ b/mercurial/commands.py	Mon Oct 24 16:57:14 2011 -0500
@@ -2553,8 +2553,9 @@
         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