# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 2010-05-01 14:29:27
# Node ID 8dd69bee71da1e358e453daeb7416154eae50019
# Parent  d29bd98ebff695738aec2baf3ee29a5d2a4286cf

convert/svn: tree conflicts no longer happen now we use memctx

diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py
--- a/hgext/convert/subversion.py
+++ b/hgext/convert/subversion.py
@@ -656,14 +656,10 @@ class svn_source(converter_source):
                 if fromkind == svn.core.svn_node_file:
                     entries.append(self.recode(entrypath))
                 elif fromkind == svn.core.svn_node_dir:
-                    if ent.action == 'C':
-                        children = self._find_children(path, prevnum)
-                    else:
-                        oroot = parentpath.strip('/')
-                        nroot = path.strip('/')
-                        children = self._find_children(oroot, prevnum)
-                        children = [s.replace(oroot, nroot) for s in children]
-
+                    oroot = parentpath.strip('/')
+                    nroot = path.strip('/')
+                    children = self._find_children(oroot, prevnum)
+                    children = [s.replace(oroot, nroot) for s in children]
                     for child in children:
                         childpath = self.getrelpath("/" + child, pmodule)
                         if not childpath: