From owner-freebsd-questions@FreeBSD.ORG Wed Jan 28 14:12:09 2004 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A2E1416A4D2 for ; Wed, 28 Jan 2004 14:12:09 -0800 (PST) Received: from post.web.ca (post.web.ca [192.139.37.29]) by mx1.FreeBSD.org (Postfix) with ESMTP id 954FB43D6B for ; Wed, 28 Jan 2004 14:12:04 -0800 (PST) (envelope-from rob@web.ca) Received: by post.web.ca (Postfix, from userid 1001) id B6F137995; Wed, 28 Jan 2004 17:12:03 -0500 (EST) Date: Wed, 28 Jan 2004 17:12:03 -0500 From: Rob Ellis To: Dan Nelson Message-ID: <20040128221203.GC64221@web.ca> Mail-Followup-To: Rob Ellis , Dan Nelson , freebsd-questions@freebsd.org References: <20040127190516.GP57848@web.ca> <20040127213316.GA81362@falcon.midgard.homeip.net> <20040127220643.GC26356@dan.emsphone.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20040127220643.GC26356@dan.emsphone.com> User-Agent: Mutt/1.4.1i cc: freebsd-questions@freebsd.org Subject: Re: Tracking local port hacks? X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jan 2004 22:12:09 -0000 On Tue, Jan 27, 2004 at 04:06:44PM -0600, Dan Nelson wrote: > In the last episode (Jan 27), Erik Trulsson said: > > On Tue, Jan 27, 2004 at 02:05:16PM -0500, Rob Ellis wrote: > > > We sometimes find it necessary to make some small change to a port > > > before installing it, and need a way to track/merge these changes > > > as ports are updated. Is there a recommended way of doing that? > > > > > > The cvsup faq (http://www.cvsup.org) suggests that it's possible to > > > get sources in "cvs mode" and it has some suggestions for managing > > > a local branch. Is that the best way to do it? Anyone know how BIG > > > the ports tree is if we get it via cvsup in "cvs mode"? > > > > Using cvsup to maintain a copy of the whole (or part of the) CVS > > repository, and then using cvs to check out the branch/version you > > want is certainly one way to do it. Cvs (unlike cvsup) understands > > local changes and can merge changed files (assuming the changes don't > > conflict of course, then you have to do some editing by hand.) > > > > I don't know if it is the *best* way of doing it, but it is the way I > > do it and it works fairly well. > > I do it too. It takes a bit longer to update, since you have to "cvsup" > then cvs "update -dP", but I do it at night via cron, and get an email > the next morning if there were any conflicts with local changes. > Thanks. So you don't have a local branch, just leave your changes as unchecked-in modifications in your ports 'sandbox' ? Any thoughts about trying to maintain a local branch? I was thinking (after more reading about cvs) something like: # once, in the sandbox cvs tag -b myports cvs update -r myports # nightly, in cvs mode... cvsup # after cvsup, in the sandbox cvs update -dP -j HEAD # after update, check for conflicts, then... cvs commit -m 'cvsup changes' ?? - Rob