Date: Fri, 09 Nov 2007 23:12:39 +0800 From: OutbackDingo <outbackdingo@gmail.com> To: Tom Evans <tevans.uk@googlemail.com> Cc: freebsd-hackers@freebsd.org, Ian FREISLICH <ianf@clue.co.za>, "Aryeh M. Friedman" <aryeh.friedman@gmail.com>, freebsd-current@freebsd.org Subject: Re: questions on development(7) Message-ID: <1194621176.1219.3.camel@z60m.optimlabs.com> In-Reply-To: <1194619407.64797.64.camel@localhost> References: <E1IqTxn-0001He-La@clue.co.za> <4733F1DA.60706@gmail.com> <1194616213.8643.24.camel@z60m.optimlabs.com> <1194619407.64797.64.camel@localhost>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 2007-11-09 at 14:43 +0000, Tom Evans wrote: > On Fri, 2007-11-09 at 21:49 +0800, OutbackDingo wrote: > > well thats kinda hard to do with CVS, though other revision systems such > > as mercurial, bazaar, git and perforce, even subversion do it well, > > there is also a mercurial respository for FreeBSD out there some where > > > > On Fri, 2007-11-09 at 05:36 +0000, 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? > > > > > > > (Nothing like top posting to destroy the thread flow) > > OutbackDingo is incorrect. That is the entire purpose of CVS, otherwise > they might as well call it VS.. > > Your /usr/src will be a checkout of a particular branch of freebsd > (called a working copy). You periodically update your cvs repository > (where you checkout from) with the latest freebsd commits. > When you wish to, you update your working copy from your repository by > issuing a 'cvs up'. This merges changes in the repository into your > local copy, merging in with the local changes. > When you want to see what has changed since you last did a 'cvs up', > issue a 'cvs -n up'. > When you want to see the local modifications in your working copy, issue > a 'cvs diff'. > > Read the cvs red-bean book for more info. > http://cvsbook.red-bean.com/cvsbook.html > > HTH > > Tom Well I wouldnt say incorrect as i stated it was hard to do. Meaning its easier to complete these tasks with a different RCS, in my OWN opinion. So as not to clobber ones changes locally. I didnt say it could not be done, its simply more difficult to achieve the same result as with other RCS systems. The reason I sated as more difficult to do, Ive seen quite a number of times when tracking a vendor branch, that merges had to be more manually handled because of local changes. This is another of those "preferences" people get into wars over, Best OS, Browser, RCS etc etc etc...
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1194621176.1219.3.camel>