From owner-cvs-all Wed Jan 24 12:52:44 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 1627C37B400; Wed, 24 Jan 2001 12:52:25 -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 f0OKqM961067; Wed, 24 Jan 2001 13:52:22 -0700 (MST) (envelope-from imp@harmony.village.org) Message-Id: <200101242052.f0OKqM961067@harmony.village.org> To: Archie Cobbs Subject: Re: cvs commit: src/contrib/tcpdump print-smb.c Cc: John Baldwin , cvs-all@FreeBSD.org, cvs-committers@FreeBSD.org, kris@FreeBSD.org In-reply-to: Your message of "Wed, 24 Jan 2001 09:26:07 PST." <200101241726.JAA02576@curve.dellroad.org> References: <200101241726.JAA02576@curve.dellroad.org> Date: Wed, 24 Jan 2001 13:52:22 -0700 From: Warner Losh Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG In message <200101241726.JAA02576@curve.dellroad.org> Archie Cobbs writes: : 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? Incorrect. Given that you have to manage merges for ever more after you take it off the vendor branch, this can make importing new versions harder. I've had similar problems in other trees where CVS found conflicts for reasons that I didn't understand, but which I grit my teeth and resolved by hand myself. Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message