From owner-freebsd-questions Tue Apr 20 14:45:58 1999 Delivered-To: freebsd-questions@freebsd.org Received: from quackerjack.cc.vt.edu (quackerjack.cc.vt.edu [198.82.160.250]) by hub.freebsd.org (Postfix) with ESMTP id C644114F5A for ; Tue, 20 Apr 1999 14:45:41 -0700 (PDT) (envelope-from jobaldwi@vt.edu) Received: from sable.cc.vt.edu (sable.cc.vt.edu [128.173.16.30]) by quackerjack.cc.vt.edu (8.8.8/8.8.8) with ESMTP id RAA17925; Tue, 20 Apr 1999 17:43:09 -0400 (EDT) Received: from john.baldwin.cx (jobaldwi.campus.vt.edu [198.82.67.63]) by sable.cc.vt.edu (8.8.8/8.8.8) with ESMTP id RAA12899; Tue, 20 Apr 1999 17:43:08 -0400 (EDT) Message-ID: X-Mailer: XFMail 1.3 [p0] on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Tue, 20 Apr 1999 17:43:08 -0400 (EDT) From: John Baldwin To: Doug White Subject: Re: CVS diff question... Cc: freebsd-questions@FreeBSD.ORG, John Baldwin Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On 20-Apr-99 Doug White wrote: > On Mon, 19 Apr 1999, John Baldwin wrote: > >> Is there any easy way to do a diff of a file from a certain date on a >> branch other than HEAD? For example, after I update my sources from >> my local repository, I would like to run 'cvs diff' against GENERIC >> and LINT to see what changes were made since the last time I updated. >> Thus, I want to be able to do "cvs diff -D GENERIC" and >> have it look up the revision of GENERIC on the RELENG_3 branch instead >> of on the HEAD branch to compare to my local GENERIC file, which has a >> sticky tag of RELENG_3. Is there any easy way to do this w/o having >> to page through 'cvs log' to find the specific revision number on >> RELENG_3 at that date and then use 'cvs diff' with that? Thanks. > > Just specify the target revision as the second argument. For your case: > > cvs diff -rRELENG_3 -dyesterday GENERIC That uses yesterday's GENERIC from -current and compares it against today's RELENG_3 GENERIC. I need to be able to compare yesterday's GENERIC from RELENG_3 against today's GENERIC from RELENG_3, and there doesn't seem to be a way to tell cvs diff to use "yesterday's GENERIC from RELENG_3". Thanks for your reply, though. > Or whatever. > > Doug White > Internet: dwhite@resnet.uoregon.edu | FreeBSD: The Power to Serve > http://gladstone.uoregon.edu/~dwhite | www.freebsd.org --- John Baldwin -- http://members.freedomnet.com/~jbaldwin/ PGP Key: http://members.freedomnet.com/~jbaldwin/pgpkey.asc "Power Users Use the Power to Serve!" - http://www.freebsd.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message