From owner-cvs-all Wed Jan 24 13: 7:11 2001 Delivered-To: cvs-all@freebsd.org Received: from mailman.zeta.org.au (mailman.zeta.org.au [203.26.10.16]) by hub.freebsd.org (Postfix) with ESMTP id E9FF537B401; Wed, 24 Jan 2001 13:06:44 -0800 (PST) Received: from bde.zeta.org.au (bde.zeta.org.au [203.2.228.102]) by mailman.zeta.org.au (8.9.3/8.8.7) with ESMTP id IAA21807; Thu, 25 Jan 2001 08:06:38 +1100 Date: Thu, 25 Jan 2001 08:06:29 +1100 (EST) From: Bruce Evans X-Sender: bde@besplex.bde.org To: Archie Cobbs Cc: John Baldwin , cvs-all@FreeBSD.org, cvs-committers@FreeBSD.org, kris@FreeBSD.org Subject: Re: cvs commit: src/contrib/tcpdump print-smb.c In-Reply-To: <200101241726.JAA02576@curve.dellroad.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Wed, 24 Jan 2001, Archie Cobbs wrote: > John Baldwin writes: > > >> 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. So there should be zero extra work > > > caused by this change, unless I'm misunderstanding something (I'm > > > not a CVS expert). > > > > See the committers guide, it has a FAQ for this: > > > > http://www.freebsd.org/tutorials/committers-guide/article.html > > So from my reading of that, the only problem is the size of the > repository file (and associated side effects on things like cvsup), > not that anybody has to do any extra work... correct? No. The FAQ is a FWrongAnswer as usual. No one cared much about disk space even a few years ago when the FAQ was written. The main problems are: - From now on, every new vendor release of that file will need to have patches merged by hand. - From now on, every new vendor release of that file will need to have patches _verified_ by hand. - -j doesn't work very well. Ask obrien for horror stories. Bruce To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message