Date: Fri, 09 Nov 2007 14:43:27 +0000 From: Tom Evans <tevans.uk@googlemail.com> To: OutbackDingo <outbackdingo@gmail.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: <1194619407.64797.64.camel@localhost> In-Reply-To: <1194616213.8643.24.camel@z60m.optimlabs.com> References: <E1IqTxn-0001He-La@clue.co.za> <4733F1DA.60706@gmail.com> <1194616213.8643.24.camel@z60m.optimlabs.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-Gt12PG58YM+6X02s0p4k Content-Type: text/plain Content-Transfer-Encoding: quoted-printable 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 >=20 > 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 t= he > > >> 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. > >=20 > > What I meant was how do I keep from clobbering my local changes? > >=20 >=20 (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.=20 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 --=-Gt12PG58YM+6X02s0p4k Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (FreeBSD) iD8DBQBHNHILlcRvFfyds/cRArXUAJ0ar4mNW70v/FDLoVlF9DxWVkoR0ACfRHU4 seH30Lq+tzYuHD7/gdqNa44= =Rjv3 -----END PGP SIGNATURE----- --=-Gt12PG58YM+6X02s0p4k--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1194619407.64797.64.camel>