Ethereal-dev: Re: [Ethereal-dev] packet-cops.c update for PacketCable - patch

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Guy Harris <gharris@xxxxxxxxx>
Date: Thu, 15 Apr 2004 02:32:59 -0700
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.