From owner-freebsd-current@FreeBSD.ORG Fri Nov 9 14:43:38 2007 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA6EB16A4A6 for ; Fri, 9 Nov 2007 14:43:38 +0000 (UTC) (envelope-from tevans.uk@googlemail.com) Received: from rv-out-0910.google.com (rv-out-0910.google.com [209.85.198.185]) by mx1.freebsd.org (Postfix) with ESMTP id 8D9A913C4A8 for ; Fri, 9 Nov 2007 14:43:38 +0000 (UTC) (envelope-from tevans.uk@googlemail.com) Received: by rv-out-0910.google.com with SMTP id l15so437370rvb for ; Fri, 09 Nov 2007 06:43:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=beta; h=domainkey-signature:received:received:subject:from:to:cc:in-reply-to:references:content-type:date:message-id:mime-version:x-mailer; bh=l9eXj5f2cjbXMU/791UCvSHED3rOdF3yRqCxPUJxesY=; b=iZCMIMF9oUSDVWsOqHtvf9mo89aFQjHOjenrhAYFMYXQAa8o0F2vUX6AwuU+t1Iqovgl8Vwqct1TZAGsWFuaih1mJU62Xth9430GttMepG6NVngQTpv17LSH8HJ2fgf+OqKNWHsdfwS4vWaDKtCvqiknnBKCwEs5L80aqjyOdl4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=beta; h=received:subject:from:to:cc:in-reply-to:references:content-type:date:message-id:mime-version:x-mailer; b=TDbvlkPHWqhqmCrBRSJriXj58XpLP4RJu69ARllo39r2A5+ifOoR/5Ew/n+ZVw0nmuPXCy1a0+34eii4d0uQ1CZbL/p7fxRfnj4myeR/BVFfKRaBo4rtS/ln8xnKBbfJh/XkpLB10/WDhjym9KvUv0AmKxjT8QOjuMop2TYC2bQ= Received: by 10.140.200.16 with SMTP id x16mr967811rvf.1194619411340; Fri, 09 Nov 2007 06:43:31 -0800 (PST) Received: from ?127.0.0.1? ( [217.206.187.79]) by mx.google.com with ESMTPS id f7sm112009nfh.2007.11.09.06.43.28 (version=SSLv3 cipher=RC4-MD5); Fri, 09 Nov 2007 06:43:30 -0800 (PST) From: Tom Evans To: OutbackDingo In-Reply-To: <1194616213.8643.24.camel@z60m.optimlabs.com> References: <4733F1DA.60706@gmail.com> <1194616213.8643.24.camel@z60m.optimlabs.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-Gt12PG58YM+6X02s0p4k" Date: Fri, 09 Nov 2007 14:43:27 +0000 Message-Id: <1194619407.64797.64.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.10.2 FreeBSD GNOME Team Port Cc: freebsd-hackers@freebsd.org, Ian FREISLICH , "Aryeh M. Friedman" , freebsd-current@freebsd.org Subject: Re: questions on development(7) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Nov 2007 14:43:38 -0000 --=-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--