Date: Fri, 9 Nov 2007 07:40:30 -0600 From: Eric Anderson <anderson@freebsd.org> To: "Aryeh M. Friedman" <aryeh.friedman@gmail.com> Cc: freebsd-hackers@freebsd.org, Ian FREISLICH <ianf@clue.co.za>, freebsd-current@freebsd.org Subject: Re: questions on development(7) Message-ID: <AF4CB6DD-F81C-4E5B-9DDB-3959A0D2C75B@freebsd.org> In-Reply-To: <4733F1DA.60706@gmail.com> References: <E1IqTxn-0001He-La@clue.co.za> <4733F1DA.60706@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Nov 8, 2007, at 11:36 PM, Aryeh M. Friedman wrote: > >>> >>> 2. If yes to #1 how do I setup keeping everything except my modified >>> code in sync (and if possible to retro activally apply patchs from >>> the >>> local branch unto the main source tree [/usr/src2]) >> >> You won't be able to commit to the BSD repo from your server. I >> think you should treat your repo as read only and use cvsup to keep >> it up to date. At least that's what I do. > > What I meant was how do I keep from clobbering my local changes? If you keep a local repo, and checkout from the local repo, then your checkout will merge the changes (unless there are conflicts). Eric
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AF4CB6DD-F81C-4E5B-9DDB-3959A0D2C75B>