Date: Mon, 10 Dec 2001 14:56:50 -0800 From: Peter Wemm <peter@wemm.org> To: Julian Elischer <julian@elischer.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/gnu/usr.bin/rcs/ident ident.c Message-ID: <20011210225650.4265B39F0@overcee.netplex.com.au> In-Reply-To: <Pine.BSF.4.21.0112101435190.689-100000@InterJet.elischer.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Julian Elischer wrote:
> this seems completely wrong to me.
But that's the way that RCS works, and cvs is a layer on top of the
rcs file format.
> I think it should be expanded on input so that the version
> in the repository has teh new string on it already..
That's the way that perforce does it FWIW. It saves a lot of heartache.
> 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..
Sorry, but it isn't going to work. If you want it to be expanded correctly,
then use a seperate CVSROOT. If you are using pserver, that is still easy
as you can add extra --allow-root=/home/ncvs or wherever you keep it.
But sucking freebsd src/* into a subdirectory of mirror/freebsd/src in
another CVS repo is going to get you exactly what you see above.
We would have to regenerate each and every file in every revision right back
to 1.1 if we wanted to change this, and then we have a custom cvs that
doesn't match the rest of the world. Not to mention cvsup...
Sorry, but cvs sucks.
> 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 twea
k)
> > > >
> > > > 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
> >
> >
>
>
>
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?20011210225650.4265B39F0>