Date: Tue, 6 Feb 2001 01:01:08 -0800 From: "David O'Brien" <obrien@FreeBSD.org> To: Archie Cobbs <archie@dellroad.org> Cc: Kris Kennaway <kris@FreeBSD.org>, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/tcpdump print-smb.c Message-ID: <20010206010108.C33865@dragon.nuxi.com> In-Reply-To: <200101240610.WAA00480@curve.dellroad.org>; from archie@dellroad.org on Tue, Jan 23, 2001 at 10:10:49PM -0800 References: <20010123215539.A27564@citusc17.usc.edu> <200101240610.WAA00480@curve.dellroad.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Jan 23, 2001 at 10:10:49PM -0800, Archie Cobbs wrote:
> > > Sorry if I'm being obtuse, but how is that a problem? Doesn't CVS
> > > do the right thing in this case? There are lots of other files
> > > in that directory with $FreeBSD$ in them.
> >
> > No. From now on, every new vendor release of that file will need to
> > have patches merged by hand.
>
> By hand? The "cvs update -j .. -j .." or whatever that you do after
> an import should take care of all of the non-conflicting modifications
> for all of the files at once.
Uh.. NO! You wish. You have NO idea how much time I spend fixing up GCC
and Binutils files just to add "/* $FreeBSD$ */" because ``CVS -j -j''
is still fscking STUPID to DTRT.
> So there should be zero extra work caused by this change,
As I said, "WRONG".
--
-- David (obrien@FreeBSD.org)
GNU is Not Unix / Linux Is Not UniX
Disclaimer: Not speaking for FreeBSD, just expressing my own opinion.
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?20010206010108.C33865>