From owner-freebsd-questions@FreeBSD.ORG Tue Jan 16 00:06:18 2007 Return-Path: X-Original-To: freebsd-questions@FreeBSD.org Delivered-To: freebsd-questions@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9F0B416A407 for ; Tue, 16 Jan 2007 00:06:18 +0000 (UTC) (envelope-from erikt@midgard.homeip.net) Received: from ch-smtp01.sth.basefarm.net (ch-smtp01.sth.basefarm.net [80.76.149.212]) by mx1.freebsd.org (Postfix) with ESMTP id 2BFA913C465 for ; Tue, 16 Jan 2007 00:06:18 +0000 (UTC) (envelope-from erikt@midgard.homeip.net) Received: from c83-253-29-241.bredband.comhem.se ([83.253.29.241]:63658 helo=falcon.midgard.homeip.net) by ch-smtp01.sth.basefarm.net with smtp (Exim 4.63) (envelope-from ) id 1H6bqC-0006R4-5p for freebsd-questions@FreeBSD.org; Tue, 16 Jan 2007 01:06:17 +0100 Received: (qmail 92430 invoked from network); 16 Jan 2007 01:06:12 +0100 Received: from owl.midgard.homeip.net (10.1.5.7) by falcon.midgard.homeip.net with SMTP; 16 Jan 2007 01:06:12 +0100 Received: (qmail 78397 invoked by uid 1001); 16 Jan 2007 01:06:12 +0100 Date: Tue, 16 Jan 2007 01:06:12 +0100 From: Erik Trulsson To: Jeremie Le Hen Message-ID: <20070116000612.GA78372@owl.midgard.homeip.net> Mail-Followup-To: Jeremie Le Hen , freebsd-questions@FreeBSD.org References: <20070115235119.GE4259@obiwan.tataz.chchile.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070115235119.GE4259@obiwan.tataz.chchile.org> User-Agent: Mutt/1.5.13 (2006-08-11) X-ACL-Warn: Too high rate of unknown addresses received from you X-Scan-Result: No virus found in message 1H6bqC-0006R4-5p. X-Scan-Signature: ch-smtp01.sth.basefarm.net 1H6bqC-0006R4-5p fa3889e60f8027c554fa609c4faef108 Cc: freebsd-questions@FreeBSD.org Subject: Re: Diffing RELENG_6 between two dates from cvs X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jan 2007 00:06:18 -0000 On Tue, Jan 16, 2007 at 12:51:19AM +0100, Jeremie Le Hen wrote: > Hi list, > > (Please Cc: my in your replies.) > > I am looking for a way to achieve what I would intuitively write: > cvs diff -r RELENG_6 -D -D > > Some people would point me to the info-cvs mailing-list for this > question doesn't seem to be related to FreeBSD. Nonetheless FreeBSD 6 > has cvs 1.11.17-FreeBSD and I am pretty sure that cvs guys would to me > to use a newer version of cvs: this is indeed a FAQ [1]. Starting at > version 1.12.12, cvs can handle the following syntax: > cvs diff -r : -r : > > [1] http://ximbiot.com/cvs/wiki/index.php?title=CVS_FAQ#How_do_I_get_a_date_based_diff_on_a_branch.3F > > The proposed workaround works but it implies to have write access to > the repository. Moreover tagging the whole src/ tree is a bit overkill > for such a task. > > I've read somewhere it is possible to use "cvs diff -j :", > but I wasn't able to confirm this. Why did you not just try it? Yes it works fine, the syntax being cvs diff -j : -j : [files] It is even documented in the cvs(1) manpage. (This might be a FreeBSD specific extension to CVS and thus not appear in the documentation for the "official" CVS releases. Not sure about that.) > > Any clue or pointers are welcome. > > Thank you. > Best regards, > > > PS: In the meantime, one can use "cvs update -r -D " but > "cvs status" reveals only a sticky tag. The sticky date is lost, > probably because the CVS/Entries file can handle either flag "T" > or "D" and not both together. Does any one know how to > workaround this, or if it has been addressed in later version of cvs ? -- Erik Trulsson ertr1013@student.uu.se