convert: handle trailing slashes in filemap better (issue3124) stable

convert: handle trailing slashes in filemap better (issue3124)

--- a/hgext/convert/filemap.py	Wed Nov 23 14:24:56 2011 -0800
+++ b/hgext/convert/filemap.py	Wed Nov 23 16:25:44 2011 -0600
@@ -99,6 +99,8 @@
             if newpre == '.':
                 return suf
             if suf:
+                if newpre.endswith('/'):
+                    return newpre + suf
                 return newpre + '/' + suf
             return newpre
         return name