convert/svn: fix backtrace in tags discovery (issue1742)
authorPatrick Mezard <pmezard@gmail.com>
Fri, 17 Jul 2009 13:31:12 +0200
changeset 9168 e8441597d2ee
parent 9130 335f749cc369
child 9169 7a276f72a08a
child 9173 fe160ba4c976
child 9174 705278e70457
convert/svn: fix backtrace in tags discovery (issue1742)
hgext/convert/subversion.py
--- a/hgext/convert/subversion.py	Fri Jul 10 19:45:31 2009 +0200
+++ b/hgext/convert/subversion.py	Fri Jul 17 13:31:12 2009 +0200
@@ -455,8 +455,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: