Mercurial > hg

changeset 13653:30a0e3519f69

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 15 Mar 2011 16:53:46 -0500
parents 0652b2da832d (current diff) 9777df929035 (diff)
children a1dae38acbc6
files hgext/convert/subversion.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/convert/subversion.py	Mon Mar 14 22:37:50 2011 +0100
+++ b/hgext/convert/subversion.py	Tue Mar 15 16:53:46 2011 -0500
@@ -866,7 +866,9 @@
         pool = Pool()
         rpath = '/'.join([self.baseurl, urllib.quote(path)]).strip('/')
         entries = svn.client.ls(rpath, optrev(revnum), True, self.ctx, pool)
-        return ((path + '/' + p) for p, e in entries.iteritems()
+        if path:
+            path += '/'
+        return ((path + p) for p, e in entries.iteritems()
                 if e.kind == svn.core.svn_node_file)
 
     def getrelpath(self, path, module=None):