Mercurial > hg

changeset 9173:fe160ba4c976

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Matt Mackall <mpm@selenic.com>
date Fri, 17 Jul 2009 11:52:53 -0500
parents 996c1cd8f530 (current diff) e8441597d2ee (diff)
children 41bc92142f06
files
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/convert/subversion.py	Tue Jul 14 14:05:07 2009 +0200
+++ b/hgext/convert/subversion.py	Fri Jul 17 11:52:53 2009 -0500
@@ -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: