# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1416072951 18000
# Node ID 5ee3e5030a35d00173359e10e90bf07e7377a680
# Parent  4744b7bfa4768f6302dd3c961df6de0631f43bfb# Parent  85fe080461c6a475619a4d6b1721447919316645
Merge with stable.

diff --git a/hgsubversion/svncommands.py b/hgsubversion/svncommands.py
--- 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')