Date: Mon, 10 Dec 2001 14:27:31 -0800 (PST) From: Julian Elischer <julian@elischer.org> To: Peter Wemm <peter@wemm.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/gnu/usr.bin/rcs/ident ident.c Message-ID: <Pine.BSF.4.21.0112101426510.689-100000@InterJet.elischer.org> In-Reply-To: <20011210222329.DA5EB38CC@overcee.netplex.com.au>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 10 Dec 2001, Peter Wemm wrote: > Julian Elischer wrote: > > Peter, > > > > We mirror the FreeBSD tree here, but when I check anything out, > > it seems to have the previous $FreeBSD:$ line > > and not the one that represents the level the file is checked out at. > > > > Obviously this totallyu screwn up "mergemaster" and a few other utilities, > > and makes it really hard to difff stuff.. > > > > So, What is the scheme here? is the line updated on checkin or checkout? > > Should we be running some hacked version of cvs to be able to have > > $FreeBSD$ lines expanded correctly? > > The line is updated on checkout. Make sure you have got a valid > CVSROOT/options file which specifies that $FreeBSD$ is to be expanded > correctly. Note that we disable $Id$ etc as well. Ah that's what I was looking for. > > Recently we have been collapsing the tags to plain $FreeBSD$ with nothing > else in there at all so that we dont get an extra +1/-1 in the deltas. > > > (the cvs server and client are both on 4.4) > > > > Julian > > > > On Mon, 10 Dec 2001, Peter Wemm wrote: > > > > > peter 2001/12/10 12:49:37 PST > > > > > > Modified files: (Branch: RELENG_4) > > > gnu/usr.bin/rcs/ident ident.c > > > Log: > > > MFC: 1.8: recognize numeric $Id$ tags such as $XFree86$ (trivial tweak) > > > > > > Revision Changes Path > > > 1.7.2.1 +1 -1 src/gnu/usr.bin/rcs/ident/ident.c > > > > > > > > > > > Cheers, > -Peter > -- > Peter Wemm - peter@FreeBSD.org; peter@yahoo-inc.com; peter@netplex.com.au > "All of this is for nothing if we don't go to the stars" - JMS/B5 > > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0112101426510.689-100000>