From owner-cvs-all Wed Jan 24 12:57:25 2001 Delivered-To: cvs-all@freebsd.org Received: from harmony.village.org (rover.village.org [204.144.255.66]) by hub.freebsd.org (Postfix) with ESMTP id CB50037B400; Wed, 24 Jan 2001 12:57:01 -0800 (PST) Received: from harmony.village.org (localhost.village.org [127.0.0.1]) by harmony.village.org (8.11.1/8.11.1) with ESMTP id f0OKut961097; Wed, 24 Jan 2001 13:56:55 -0700 (MST) (envelope-from imp@harmony.village.org) Message-Id: <200101242056.f0OKut961097@harmony.village.org> To: Garance A Drosihn Subject: Re: cvs commit: src/contrib/tcpdump print-smb.c Cc: John Baldwin , Archie Cobbs , cvs-all@FreeBSD.org, cvs-committers@FreeBSD.org, Kris Kennaway In-reply-to: Your message of "Wed, 24 Jan 2001 13:26:52 EST." References: Date: Wed, 24 Jan 2001 13:56:55 -0700 From: Warner Losh Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG 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. : What I don't know is how the repository is effected if the vendor : does (later on) include this patch. Do we automatically switch : to following the "official vendor version" at that point, or do : we keep adding to the repository bloat because we branched off : at the earlier point? It remains off the vendor branch and we have to merge changes to that file every single time we do an update. Usually this is automatically handled by cvs, but sometimes cvs gets confused or it just can't cope. Also, it effectively doubles the size of the file because all deltas are recorded twice. Once on the normal branch, and once on the vendor branch. 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. Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message