From owner-cvs-all  Tue Feb  6  1: 1:33 2001
Delivered-To: cvs-all@freebsd.org
Received: from dragon.nuxi.com (trang.nuxi.com [209.152.133.57])
	by hub.freebsd.org (Postfix) with ESMTP
	id C5DFE37B67D; Tue,  6 Feb 2001 01:01:11 -0800 (PST)
Received: (from obrien@localhost)
	by dragon.nuxi.com (8.11.2/8.11.1) id f16919P19010;
	Tue, 6 Feb 2001 01:01:09 -0800 (PST)
	(envelope-from obrien)
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>
Reply-To: obrien@FreeBSD.org
References: <20010123215539.A27564@citusc17.usc.edu> <200101240610.WAA00480@curve.dellroad.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <200101240610.WAA00480@curve.dellroad.org>; from archie@dellroad.org on Tue, Jan 23, 2001 at 10:10:49PM -0800
X-Operating-System: FreeBSD 5.0-CURRENT
Organization: The NUXI BSD group
X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3  90 76 5D 69 58 D9 98 7A
X-Pgp-Rsa-Keyid: 1024/34F9F9D5
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

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