From owner-cvs-all Wed Jan 24 13:22:49 2001 Delivered-To: cvs-all@freebsd.org Received: from khavrinen.lcs.mit.edu (khavrinen.lcs.mit.edu [18.24.4.193]) by hub.freebsd.org (Postfix) with ESMTP id 5BFE137B401; Wed, 24 Jan 2001 13:22:25 -0800 (PST) Received: (from wollman@localhost) by khavrinen.lcs.mit.edu (8.9.3/8.9.3) id QAA66850; Wed, 24 Jan 2001 16:22:11 -0500 (EST) (envelope-from wollman) Date: Wed, 24 Jan 2001 16:22:11 -0500 (EST) From: Garrett Wollman Message-Id: <200101242122.QAA66850@khavrinen.lcs.mit.edu> To: Warner Losh Cc: cvs-all@FreeBSD.org, cvs-committers@FreeBSD.org Subject: Re: cvs commit: src/contrib/tcpdump print-smb.c In-Reply-To: <200101242052.f0OKqM961067@harmony.village.org> References: <200101241726.JAA02576@curve.dellroad.org> <200101242052.f0OKqM961067@harmony.village.org> Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG < said: > 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. Resolving merge conflicts is easy once the two branches become identical again -- `cvs upd -j' does the Right Thing. HOWEVER: because of the $FreeBSD$ requirement, we can never get two branches to be the same again. Even in that case it's still not a problem, provided that the $FreeBSD$ keyword is at least two lines separated from anything that the vendor changes. You'll note a couple of tz database updates ago, I moved all of the $FreeBSD$ comments so that they were not snug up against the vendor SCCS information. Because the vendor's SCCS tag changes every update, this was a bad place to put our $FreeBSD$ tag, because CVS's (RCS's, really) merge algorithm cannot tell the difference between a one-line change plus a one-line insertion, and one line becoming two. -GAWollman To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message