[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xwt-patches
Subject:    [patches] proposed patch to CVSROOT: allow patches to files with \r
From:       david () xwt ! org
Date:       2003-04-25 23:51:17
[Download RAW message or body]

Instead of rejecting all \r chracters in a patch file, only \r characters in the \
added secionts cause rejection.

This would let me upload the Rhino fix to make HEAD work again, as Rhino is filled \
with \r's. This patch has not had as much testing as it should've, but I don't have a \
similar repository to test it on.

Index: commit
===================================================================
RCS file: /cvs/CVSROOT/commit,v
retrieving revision 1.87
diff -u -r1.87 commit
--- commit	31 Mar 2003 12:38:28 -0000	1.87
+++ commit	25 Apr 2003 23:45:50 -0000
@@ -20,7 +20,7 @@
         print "Thanks for playing.  Goodbye.\n\n$thisdiff";
         exit -1;
     }
-    if ($thisdiff =~ /\r/s) {
+    if ($thisdiff =~ /\n\+ [^\n]*\r/s) {
         print "\n\n** ERROR ***********************************\n";
         print "You tried to introduce \\r's (Win32/MacOS9 file endings) into \
$ARGV[$i]\n";  print "Please unixify your file and try again.\n";


[prev in list] [next in list] [prev in thread] [next in thread]