# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1247839279 -7200
# Node ID 7a276f72a08a93f2266ee4a797b202bf7d9769b8
# Parent  b67adc2daa159d03582783a1cd81e11dba0c9c02# Parent  e8441597d2eefeb89abf71c205470928bfdd8159
Merge with crew-stable

diff -r b67adc2daa15 -r 7a276f72a08a hgext/convert/subversion.py
--- a/hgext/convert/subversion.py	Thu Jul 16 21:05:24 2009 -0700
+++ b/hgext/convert/subversion.py	Fri Jul 17 16:01:19 2009 +0200
@@ -454,8 +454,9 @@
                 # Here/tags/tag.1 discarded as well as its children.
                 # It happens with tools like cvs2svn. Such tags cannot
                 # be represented in mercurial.
-                addeds = dict((p, e.copyfrom_path) for p, e
-                              in origpaths.iteritems() if e.action == 'A')
+                addeds = dict((p, e.copyfrom_path) for p, e 
+                              in origpaths.iteritems() 
+                              if e.action == 'A' and e.copyfrom_path)
                 badroots = set()
                 for destroot in addeds:
                     for source, sourcerev, dest in pendings: