From owner-freebsd-questions Sun Feb 10 6:14:15 2002 Delivered-To: freebsd-questions@freebsd.org Received: from guru.mired.org (dsl-64-192-6-133.telocity.com [64.192.6.133]) by hub.freebsd.org (Postfix) with SMTP id 0F13F37B400 for ; Sun, 10 Feb 2002 06:14:06 -0800 (PST) Received: (qmail 22296 invoked by uid 100); 10 Feb 2002 14:14:03 -0000 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <15462.32810.965372.181772@guru.mired.org> Date: Sun, 10 Feb 2002 08:14:02 -0600 To: Erik Trulsson Cc: questions@freebsd.org Subject: Re: Elegant solution to local kernel modification sought In-Reply-To: <116433496@toto.iv> X-Mailer: VM 6.90 under 21.1 (patch 14) "Cuyahoga Valley" XEmacs Lucid X-face: "5Mnwy%?j>IIV\)A=):rjWL~NB2aH[}Yq8Z=u~vJ`"(,&SiLvbbz2W`;h9L,Yg`+vb1>RG% *h+%X^n0EZd>TM8_IB;a8F?(Fb"lw'IgCoyM.[Lg#r\ From: "Mike Meyer" X-Delivery-Agent: TMDA/0.44 (Python 2.2; freebsd-4.5-STABLE-i386) Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Erik Trulsson types: > On Sun, Feb 10, 2002 at 09:54:03AM +0100, Cliff Sarginson wrote: > > Hello, > > I submitted a PR a while back for a small change to a kernel module that has > > not yet surfaced in Stable .. that's ok, I am not complaining about > > that.. but since I track STABLE, what is the easiest way to > > automatically infiltrate my change (I am looking for a generic kind > > of answer) when I cvsup (which I do once a week). > Use cvsup to get a local copy of the whole repository, and then use cvs > to update your sources from your local repository. > Cvs knows how to deal with local modifications to the source. I haven't tried it for FreeBSD, but for other projects using cvs, I don't need to keep a local copy of the repository to do this. I just point cvs at the remote repository, and then let "cvs update" do it's thing. It seems to work fine, updating files that I haven't changed, and trying to merge files that have changed in both places. Does keeping the local repository help in some way? http://www.mired.org/home/mwm/ Independent WWW/Perforce/FreeBSD/Unix consultant, email for more information. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message