# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1300226026 18000
# Node ID 30a0e3519f69142288d3d5b6d64a966cf171163d
# Parent  0652b2da832daada866a68f7a4359227570c2447# Parent  9777df929035ed35cda8c98aac846b7d138b7645
merge with stable

diff -r 0652b2da832d -r 30a0e3519f69 hgext/convert/subversion.py
--- 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):