diff --git a/vfs/ChangeLog b/vfs/ChangeLog index 55ff339e6..e63a9e088 100644 --- a/vfs/ChangeLog +++ b/vfs/ChangeLog @@ -1,3 +1,8 @@ +2003-03-24 Adam Byrtek + + * extfs/patchfs.in: Treat '\ No newline at end of file' line + as valid diff contents. + 2003-03-14 Lorinczy Zsigmond * ftpfs.c (login_server): Ask user for account if the server diff --git a/vfs/extfs/patchfs.in b/vfs/extfs/patchfs.in index 092fe0b2d..9054848ee 100644 --- a/vfs/extfs/patchfs.in +++ b/vfs/extfs/patchfs.in @@ -22,11 +22,11 @@ my $parsedates = eval 'require Date::Parse'; # regular expressions my $unified_header=qr/^--- .*\n\+\+\+ .*\n@@ .* @@.*\n$/; my $unified_extract=qr/^--- ([^\s]+).*\n\+\+\+ ([^\s]+)\s*([^\t\n]*)/; -my $unified_contents=qr/^([+\- \n]|@@ .* @@)/; +my $unified_contents=qr/^([+\-\\ \n]|@@ .* @@)/; my $context_header=qr/^\*\*\* .*\n--- .*\n\*{15}\n$/; my $context_extract=qr/^\*\*\* ([^\s]+).*\n--- ([^\s]+)\s*([^\t\n]*)/; -my $context_contents=qr/^([!+\- \n]|-{3} .* -{4}|\*{3} .* \*{4}|\*{15})/; +my $context_contents=qr/^([!+\-\\ \n]|-{3} .* -{4}|\*{3} .* \*{4}|\*{15})/; my $ls_extract_id=qr/^[^\s]+\s+[^\s]+\s+([^\s]+)\s+([^\s]+)/; my $basename=qr|^(.*/)*([^/]+)$|;