--- a/mercurial/patch.py	Fri Jan 11 18:31:13 2008 -0800
+++ b/mercurial/patch.py	Sat Jan 12 20:43:09 2008 +0100
@@ -767,7 +767,7 @@
 
 def parsefilename(str):
     # --- filename \t|space stuff
-    s = str[4:]
+    s = str[4:].rstrip('\r\n')
     i = s.find('\t')
     if i < 0:
         i = s.find(' ')