From owner-freebsd-hackers Tue Mar 19 15:57:49 2002 Delivered-To: freebsd-hackers@freebsd.org Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by hub.freebsd.org (Postfix) with ESMTP id 41F8A37B402; Tue, 19 Mar 2002 15:57:46 -0800 (PST) Received: by elvis.mu.org (Postfix, from userid 1192) id 11F72AE22C; Tue, 19 Mar 2002 15:57:46 -0800 (PST) Date: Tue, 19 Mar 2002 15:57:46 -0800 From: Alfred Perlstein To: Julian Elischer Cc: hackers@freebsd.org, peter@freebsd.org Subject: Re: CVS expansion question. Message-ID: <20020319235746.GY455@elvis.mu.org> References: <3C97CFB5.B2311029@vicor-nb.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <3C97CFB5.B2311029@vicor-nb.com> User-Agent: Mutt/1.3.27i Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG * Julian Elischer [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