Mercurial > hg

changeset 15565:3992c7df85f2 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: handle trailing slashes in filemap better (issue3124)
author Matt Mackall <mpm@selenic.com>
date Wed, 23 Nov 2011 16:25:44 -0600
parents e45dadde2761
children 7786b7dfbc46 0f208626d503 6c5e6ebe0812
files hgext/convert/filemap.py
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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