From owner-cvs-all Tue Feb 6 1: 9:42 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 0217A37B684; Tue, 6 Feb 2001 01:09:19 -0800 (PST) Received: (from obrien@localhost) by dragon.nuxi.com (8.11.2/8.11.1) id f16993g19216; Tue, 6 Feb 2001 01:09:03 -0800 (PST) (envelope-from obrien) Date: Tue, 6 Feb 2001 01:09:03 -0800 From: "David O'Brien" To: Warner Losh Cc: Garance A Drosihn , John Baldwin , Archie Cobbs , cvs-all@FreeBSD.org, cvs-committers@FreeBSD.org, Kris Kennaway Subject: Re: cvs commit: src/contrib/tcpdump print-smb.c Message-ID: <20010206010903.E33865@dragon.nuxi.com> Reply-To: obrien@FreeBSD.org References: <200101242056.f0OKut961097@harmony.village.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200101242056.f0OKut961097@harmony.village.org>; from imp@harmony.village.org on Wed, Jan 24, 2001 at 01:56:55PM -0700 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 Wed, Jan 24, 2001 at 01:56:55PM -0700, Warner Losh wrote: > In message Garance A Drosihn writes: > : If we're going to whine this much about fixing bugs, we're in > : pretty sad shape. Yes, it would be nice if the "vendor" (in > : this case) picked up the fix, and we did not have the repository > : bloat. > > The bug could have been fixed as a vendor branch import, and then when > the real fix came along, it would still be on the vendor branch. Yes, > this is ugly, but CVS requires you to play stupid games like this > because its support for vendor branches is less than could otherwise > be desired. Actually CVS does allow one to return to the vendor branch even after a file has been pulled off of it. The problem is Peter will not use this feature has he found problems with ``cvs diff -D ...'' after doing it. But I really do wonder if Peter just didn't experience the major -D bug in 1.10.7 that makes its usage in branches totally useless. > One could argue that you could change the default branch when this > happens. However, that breaks cvs update -D, which is considered a > worse breakage than the repo-bloat. Are you sure it breaks it when using CVS 1.11.0? `update -D" is very broken in 1.10.7. Just try checking out a pre-4.0 -CURRENT using 1.10.7. -- -- David (obrien@FreeBSD.org) GNU is Not Unix / Linux Is Not UniX To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message