From owner-cvs-all Wed Jan 24 9:30:26 2001 Delivered-To: cvs-all@freebsd.org Received: from InterJet.dellroad.org (adsl-63-194-81-26.dsl.snfc21.pacbell.net [63.194.81.26]) by hub.freebsd.org (Postfix) with ESMTP id E42C637B400; Wed, 24 Jan 2001 09:30:02 -0800 (PST) Received: from curve.dellroad.org (curve.dellroad.org [10.1.1.30]) by InterJet.dellroad.org (8.9.1a/8.9.1) with ESMTP id JAA51964; Wed, 24 Jan 2001 09:26:08 -0800 (PST) Received: (from archie@localhost) by curve.dellroad.org (8.9.3/8.9.3) id JAA02576; Wed, 24 Jan 2001 09:26:07 -0800 (PST) (envelope-from archie) From: Archie Cobbs Message-Id: <200101241726.JAA02576@curve.dellroad.org> Subject: Re: cvs commit: src/contrib/tcpdump print-smb.c In-Reply-To: "from John Baldwin at Jan 23, 2001 10:18:17 pm" To: John Baldwin Date: Wed, 24 Jan 2001 09:26:07 -0800 (PST) Cc: cvs-all@FreeBSD.org, cvs-committers@FreeBSD.org, kris@FreeBSD.org X-Mailer: ELM [version 2.4ME+ PL77 (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG 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? Presumably an MFC of the same fix wouldn't make the damage any worse (?) -Archie ___________________________________________________________________________ Archie Cobbs * Whistle Communications, Inc. * http://www.whistle.com To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message