changeset 1266:5ee3e5030a35

Merge with stable.
author Augie Fackler <raf@durin42.com>
date Sat, 15 Nov 2014 12:35:51 -0500
parents 4744b7bfa476 (current diff) 85fe080461c6 (diff)
children 5f86e2ac7659
files hgsubversion/svncommands.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/svncommands.py
+++ b/hgsubversion/svncommands.py
@@ -370,7 +370,7 @@ def genignore(ui, repo, force=False, **o
         if 'svn:ignore' not in props:
             continue
         lines = props['svn:ignore'].strip().split('\n')
-        ignorelines += [dir and (dir + '/' + prop) or prop for prop in lines]
+        ignorelines += [dir and (dir + '/' + prop) or prop for prop in lines if prop.strip()]
 
     repo.wopener('.hgignore', 'w').write('\n'.join(ignorelines) + '\n')