Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 Mar 2002 15:57:46 -0800
From:      Alfred Perlstein <bright@mu.org>
To:        Julian Elischer <julian@vicor-nb.com>
Cc:        hackers@freebsd.org, peter@freebsd.org
Subject:   Re: CVS expansion question.
Message-ID:  <20020319235746.GY455@elvis.mu.org>
In-Reply-To: <3C97CFB5.B2311029@vicor-nb.com>
References:  <3C97CFB5.B2311029@vicor-nb.com>

next in thread | previous in thread | raw e-mail | index | archive | help
* Julian Elischer <julian@vicor-nb.com> [020319 15:54] wrote:
> I need to compare a possibly modified version of a FreeBSD source tree
> with the checked out original FreeBSD tree in order to extract the
> diffs.
> (to recover work by someone else)
> When I do however, I get a diff for every file for $FreeBSD$
> and $Id: .
> 
> This is because whatever checked out the original, did it expanding 
> FreeBSD but not expanding $Id:
> 
> How do I make my cvs server here do the same?

I'm not sure, but you can give diff an option to ignore certain
regex:

       -I regexp
              Ignore changes that just  insert  or  delete  lines
              that match regexp.

so you can do:

cvs diff -u -I '$FreeBSD'

you can pass multiple -I options.

hope this helps.

-- 
-Alfred Perlstein [alfred@freebsd.org]
'Instead of asking why a piece of software is using "1970s technology,"
 start asking why software is ignoring 30 years of accumulated wisdom.'
Tax deductible donations for FreeBSD: http://www.freebsdfoundation.org/

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020319235746.GY455>