Mercurial > hg

changeset 11123:8dd69bee71da stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert/svn: tree conflicts no longer happen now we use memctx
author Patrick Mezard <pmezard@gmail.com>
date Sat, 01 May 2010 16:29:27 +0200
parents d29bd98ebff6
children 55abde5cba43
files hgext/convert/subversion.py
diffstat 1 files changed, 4 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/convert/subversion.py	Fri May 07 17:03:31 2010 +0200
+++ b/hgext/convert/subversion.py	Sat May 01 16:29:27 2010 +0200
@@ -656,14 +656,10 @@
                 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: