Subject: Re: cvs and $Id tags and diff
To: None <>
From: Jeremy C. Reed <>
List: tech-pkg
Date: 11/08/2005 22:05:05
On Wed, 9 Nov 2005, Hubert Feyrer wrote:

> On Tue, 8 Nov 2005, Jeremy C. Reed wrote:
>> I am attempting to compare a new version of bmake tarball with the 
>> pkgsrc/devel/bmake/files. Because of the CVS $Id$ tags, the diff is 1715 
>> lines long.
>> What are some ideas to make it so diff ignores this?
> Diff between what and what, exactly?

The extracted bmake tarball from last month and 

diff -pruN files bmake

("bmake" is the tarball's extracted directory name.)

I also just copied new files into files/ and did a "cvs diff -u"

> If it can be generated with "cvs diff", there's IIRC some way to tell cvs to 
> not expand the $Is$s

I ended up just manually reviewing them.

But now I see that this works:

cvs diff -u -I ' \$Id: ' -I ' \$NetBSD: ' devel/bmake/files

(I now remember that I had used this in a ~/.cvsrc file before.)

And that -I switch works for normal diff too. And the -X switch is also 
useful as it saves me from 187 extra lines. For example:

diff -pruN -I ' \$Id: ' -I ' \$NetBSD: ' -x CVS files bmake

  Jeremy C. Reed

  	  	 	 Media Relations and Publishing Services