From owner-cvs-src@FreeBSD.ORG Thu Jul 27 15:11:39 2006 Return-Path: X-Original-To: cvs-src@freebsd.org Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7515A16A4DA; Thu, 27 Jul 2006 15:11:39 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (vc4-2-0-87.dsl.netrack.net [199.45.160.85]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BC4643D7C; Thu, 27 Jul 2006 15:11:35 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (localhost.village.org [127.0.0.1] (may be forged)) by harmony.bsdimp.com (8.13.4/8.13.4) with ESMTP id k6RFAbig038223; Thu, 27 Jul 2006 09:10:38 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Thu, 27 Jul 2006 09:10:56 -0600 (MDT) Message-Id: <20060727.091056.635733851.imp@bsdimp.com> To: corecode@fs.ei.tum.de From: "M. Warner Losh" In-Reply-To: <44C8C0C8.4090906@fs.ei.tum.de> References: <200607251229.17862.jhb@freebsd.org> <20060725.113631.58461185.imp@bsdimp.com> <44C8C0C8.4090906@fs.ei.tum.de> X-Mailer: Mew version 4.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0 (harmony.bsdimp.com [127.0.0.1]); Thu, 27 Jul 2006 09:10:38 -0600 (MDT) Cc: obrien@freebsd.org, cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org, jhb@freebsd.org Subject: Re: cvs commit: src/share/mk bsd.cpu.mk X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 15:11:39 -0000 In message: <44C8C0C8.4090906@fs.ei.tum.de> "Simon 'corecode' Schubert" writes: : M. Warner Losh wrote: : > We need to find some way to accomplish having local changes in the : > tree that doesn't screw new imports. : : Maybe I am missing something important here, but where is the : problem with modifying files and taking them off the vendor branch? Future integrations are harder. As more and more files come off the vendor branch, it becomes increasingly difficult to use CVS to manage the delta from the point where it came off the vendor branch. CVS' vendor branches are extremely weak. : Situation 1: the vendor sources don't include the feature that is : implemented in the local changes. -> The file needs to stay off the : vendor branch. That makes future merges difficult. : Situation 2: the vendor sources integrated the modifications and : these sources and the local (off-vendor-branch) sources are the : same. -> just put the file on the vendor branch again (basically : cvs admin -b1.1.1) That breaks checkout by date, because the change of default branch isn't recorded in CVS. : another interim solution is the way we are handling it for : DragonFly: have patches somewhere else and apply them automatically : during the build process (we have a bsd.patch.mk for that. just set : SRCS+= file1.c.patch file2.c.patch) This is crap. That's what a SCM is supposed to do for you. Adding patches outside of the SCM is like putting a comdom on after sex. The results might be more enjoyable for some aspects, but worse for others. Warner