Diffing RELENG_6 between two dates from cvs
Jeremie Le Hen
jeremie at le-hen.org
Tue Jan 16 00:53:58 UTC 2007
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 . Starting at
> > version 1.12.12, cvs can handle the following syntax:
> > cvs diff -r <tag>:<date> -r <tag>:<date>
> >  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 .
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.
Jeremie Le Hen
< jeremie at le-hen dot org >< ttz at chchile dot org >
More information about the freebsd-questions