Merge with crew-stable

This commit is contained in:
Patrick Mezard 2009-07-17 16:01:19 +02:00
commit 6fb02d8b2c

View File

@ -454,8 +454,9 @@ class svn_source(converter_source):
# 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: