Date: Fri, 09 Nov 2007 15:31:59 +0200 From: Ian FREISLICH <ianf@clue.co.za> To: "Aryeh M. Friedman" <aryeh.friedman@gmail.com> Cc: freebsd-hackers@freebsd.org, freebsd-current@freebsd.org Subject: Re: questions on development(7) Message-ID: <E1IqTxn-0001He-La@clue.co.za> In-Reply-To: Message from "Aryeh M. Friedman" <aryeh.friedman@gmail.com> of "Fri, 09 Nov 2007 04:56:24 GMT." <4733E878.2050804@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
"Aryeh M. Friedman" wrote: > First of all I am posting to both -current and -hackers because > -hackers seems to be very low volume. > > I just set up a master server development server using the procedure > in development(7) which was fairly clear but left a few questions > unanswered (and one odd behavior). I have only the master server (no > clients). Just for ref my dir tree looks like this: > > /home/ncvs ---> /FreeBSD/CVSROOT > /FreeBSD/7.x (src) > /FreeBSD/current (src ports doc) > /usr/src ---> /FreeBSD/7.x > /usr/src2 ---> /FreeBSD/current > /usr/ports ---> /FreeBSD/current/ports > /usr/obj is on it's own partition > > My questions: > > 1. If I am modifing code and such should I have a local branch? > 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. > 3. The documentation said very little about how to generate patchs > between my local code and the main branch > a. Ideally I want to set it up where when I am done with a > modification it automatically creates a patch (I have never used CVS > for anything except through csup and cvsup so I am totally lost here) 'cvs diff' will generate a patch for the specified files or directories. Some like context diffs, I like unified with minimal context '-ud' option to diff. Use whichever you find easier to read. Submit patches in whatever format the developers prefer. Unified seems the most common format around here. Ian -- Ian Freislich _______________________________________________ freebsd-hackers@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-hackers To unsubscribe, send any mail to "freebsd-hackers-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1IqTxn-0001He-La>