Date: Tue, 16 Jan 2007 01:55:21 +0100 From: Jeremie Le Hen <jeremie@le-hen.org> To: Jeremie Le Hen <jeremie@le-hen.org>, freebsd-questions@FreeBSD.org Subject: Re: Diffing RELENG_6 between two dates from cvs Message-ID: <20070116005521.GF4259@obiwan.tataz.chchile.org> In-Reply-To: <20070116000612.GA78372@owl.midgard.homeip.net> References: <20070115235119.GE4259@obiwan.tataz.chchile.org> <20070116000612.GA78372@owl.midgard.homeip.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Erik, thank you for you answer. On Tue, Jan 16, 2007 at 01:06:12AM +0100, Erik Trulsson wrote: > 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 <date1> -D <date2> > > > > 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 <tag>:<date> -r <tag>:<date> > > > > [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 <date>:<tag>", > > 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 <tag1>:<date1> -j <tag2>:<date2> [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.) Now I recall where I saw the -j trick, in the manpage ! I now recall too that I tried it but it didn't work. Maybe I'm misusing it, I don't know the -j flag very well. For instance, I expected the following command to issue this diff [1]. [1] http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/systat/vmstat.c.diff?r1=1.60.2.3&r2=1.60.2.4 If I use the following commands: % cvs co -r RELENG_6 src/usr.bin/systat % cd src/usr.bin/systat % cvs diff -u -jRELENG_6:2007.01.01.00.00 -jRELENG_6:2007.01.06.00.00.00 vmstat.c I don't have this diff at all. Regards, -- Jeremie Le Hen < jeremie at le-hen dot org >< ttz at chchile dot org >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070116005521.GF4259>