# HG changeset patch # User Patrick Mezard # Date 2008-01-19 13:48:31 # Node ID ff7fb4f0db53b0430e63595428ea2cfee580a551 # Parent f1ac41359b365daad6fdf6ad8c395e4cd4636aef # Parent b32a0596b2d75f6c54e13ee4432d4630e31d0474 Merge with crew-stable diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py --- a/hgext/convert/subversion.py +++ b/hgext/convert/subversion.py @@ -490,7 +490,12 @@ class svn_source(converter_source): fromrev = froment.copyfrom_rev self.ui.debug("Info: %s %s %s %s\n" % (frompath, froment, ent, entrypath)) - fromkind = svn.ra.check_path(self.ra, entrypath, fromrev) + # We can avoid the reparent calls if the module has not changed + # but it probably does not worth the pain. + self.reparent('') + fromkind = svn.ra.check_path(self.ra, entrypath.strip('/'), fromrev) + self.reparent(self.module) + if fromkind == svn.core.svn_node_file: # a deleted file entries.append(self.recode(entry)) elif fromkind == svn.core.svn_node_dir: