From owner-freebsd-questions Wed Apr 21 11:41:27 1999 Delivered-To: freebsd-questions@freebsd.org Received: from resnet.uoregon.edu (resnet.uoregon.edu [128.223.144.32]) by hub.freebsd.org (Postfix) with ESMTP id EE1CC158B3 for ; Wed, 21 Apr 1999 11:40:13 -0700 (PDT) (envelope-from dwhite@resnet.uoregon.edu) Received: from localhost (dwhite@localhost) by resnet.uoregon.edu (8.8.8/8.8.8) with ESMTP id LAA10729; Wed, 21 Apr 1999 11:36:30 -0700 (PDT) (envelope-from dwhite@resnet.uoregon.edu) Date: Wed, 21 Apr 1999 11:36:29 -0700 (PDT) From: Doug White To: John Baldwin Cc: freebsd-questions@FreeBSD.ORG Subject: Re: CVS diff question... In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Tue, 20 Apr 1999, John Baldwin wrote: > > 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. It was meant as an example. You can specify multiple tag/date specifiers; see the cvs man page's section on diff. Or, better yet, find the version numbers you want to compare against and specify those directly. Doug White Internet: dwhite@resnet.uoregon.edu | FreeBSD: The Power to Serve http://gladstone.uoregon.edu/~dwhite | www.freebsd.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message