# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1322087144 21600
# Node ID 3992c7df85f2e404ae24af721c9ef09d1cc830f4
# Parent  e45dadde27615d2a2b8ff60327fc9a3a3cb62ddf
convert: handle trailing slashes in filemap better (issue3124)

diff -r e45dadde2761 -r 3992c7df85f2 hgext/convert/filemap.py
--- 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