[Dick Gooris <gooris@xxxxxxxxxx>]

Guy,

Thanks, I was also a bit surprised about the rather uneconomic way of the 'cvs diff' result but was not
triggered because of that. I did the work underneath Linux, and did the edit with jed. Maybe my
transportation sometimes to Windows to see if it builds there slipped in the cr/lf extra's.

Thanks for the effort !

Best regards,

    - Dick Gooris             Hilversum


Guy Harris wrote:

On Wed, Apr 14, 2004 at 12:23:31PM -0700, Dick Gooris wrote:
  

Hereby I am providing the packet-cops.patch generated via :

            #cvs diff packet-cops.c > packet-cops.patch
    

Unfortunately, it replaces every single line in the file, as the new
file has CR-LF at the end of the line and the file in CVS doesn't - and
even if I remove all the CR's from the file, the patch fails.

I ended up taking the "to" lines from the patch, removing the leading
"> " and trailing CR's, and saving that to "packet-cops.c", and checking
that in.

If you're using CVS on Windows, you might want to see whether you can
configure it to handle files in CVS that don't have CR-LF by stripping
CR's when checking in and either adding them to files checked out
(including for diffing) or removing them from files being diffed.

_______________________________________________
Ethereal-dev mailing list
Ethereal-dev@xxxxxxxxxxxx
http://www.ethereal.com/mailman/listinfo/ethereal-dev