# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1200750511 -3600
# Node ID ff7fb4f0db53b0430e63595428ea2cfee580a551
# Parent  f1ac41359b365daad6fdf6ad8c395e4cd4636aef# Parent  b32a0596b2d75f6c54e13ee4432d4630e31d0474
Merge with crew-stable

diff -r f1ac41359b36 -r ff7fb4f0db53 hgext/convert/subversion.py
--- a/hgext/convert/subversion.py	Sat Jan 19 13:19:27 2008 +0100
+++ b/hgext/convert/subversion.py	Sat Jan 19 14:48:31 2008 +0100
@@ -490,7 +490,12 @@
                     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: