From owner-cvs-all Mon Dec 10 14:23:47 2001 Delivered-To: cvs-all@freebsd.org Received: from rwcrmhc53.attbi.com (rwcrmhc53.attbi.com [204.127.198.39]) by hub.freebsd.org (Postfix) with ESMTP id 08D9F37B417; Mon, 10 Dec 2001 14:23:31 -0800 (PST) Received: from peter3.wemm.org ([12.232.27.13]) by rwcrmhc53.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20011210222330.OIDC24045.rwcrmhc53.attbi.com@peter3.wemm.org>; Mon, 10 Dec 2001 22:23:30 +0000 Received: from overcee.netplex.com.au (overcee.wemm.org [10.0.0.3]) by peter3.wemm.org (8.11.0/8.11.0) with ESMTP id fBAMNTs35916; Mon, 10 Dec 2001 14:23:29 -0800 (PST) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.netplex.com.au (Postfix) with ESMTP id DA5EB38CC; Mon, 10 Dec 2001 14:23:29 -0800 (PST) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Julian Elischer Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/gnu/usr.bin/rcs/ident ident.c In-Reply-To: Date: Mon, 10 Dec 2001 14:23:29 -0800 From: Peter Wemm Message-Id: <20011210222329.DA5EB38CC@overcee.netplex.com.au> Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG 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. 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