From owner-cvs-all  Mon Dec 10 14:40:48 2001
Delivered-To: cvs-all@freebsd.org
Received: from rwcrmhc51.attbi.com (rwcrmhc51.attbi.com [204.127.198.38])
	by hub.freebsd.org (Postfix) with ESMTP
	id EC29537B420; Mon, 10 Dec 2001 14:40:18 -0800 (PST)
Received: from InterJet.elischer.org ([12.232.206.8])
          by rwcrmhc51.attbi.com
          (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP
          id <20011210224018.QMFY5859.rwcrmhc51.attbi.com@InterJet.elischer.org>;
          Mon, 10 Dec 2001 22:40:18 +0000
Received: from localhost (localhost.elischer.org [127.0.0.1])
	by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id OAA01065;
	Mon, 10 Dec 2001 14:38:47 -0800 (PST)
Date: Mon, 10 Dec 2001 14:38:47 -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 
In-Reply-To: <20011210222329.DA5EB38CC@overcee.netplex.com.au>
Message-ID: <Pine.BSF.4.21.0112101435190.689-100000@InterJet.elischer.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

this seems completely wrong to me.
I think it should be expanded on input so that the version
in the repository has teh new string on it already..
other wise I get diffs when I compare the same file from different 
mirrors.

e.g.
 $FreeBSD: mirrored/freebsd/src/etc/csh.cshrc,v 1.3 1999/08/27 23:23:40
peter Exp $

now we put the mirror into mirrored/freebsd
in out tree but I guarantee that anything I compare it with will
not have that.. in addition it says YUO checked it in there
which is misleading as you didn't have a 'mirrored/freebsd'
directory I'm sure..

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.
> 
> 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