From owner-freebsd-hackers Sun Mar 16 11:58:11 2003 Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1BF0437B401 for ; Sun, 16 Mar 2003 11:58:09 -0800 (PST) Received: from perrin.int.nxad.com (internal.ext.nxad.com [69.1.70.251]) by mx1.FreeBSD.org (Postfix) with ESMTP id 877E143FA3 for ; Sun, 16 Mar 2003 11:58:08 -0800 (PST) (envelope-from sean@perrin.int.nxad.com) Received: by perrin.int.nxad.com (Postfix, from userid 1001) id DAAE42105B; Sun, 16 Mar 2003 11:58:07 -0800 (PST) Date: Sun, 16 Mar 2003 11:58:07 -0800 From: Sean Chittenden To: Nate Williams Cc: Sergey Babkin , hackers@FreeBSD.ORG Subject: Re: making CVS more convenient Message-ID: <20030316195807.GH66903@perrin.int.nxad.com> References: <3E73DCF7.80490FA6@bellatlantic.net> <15988.49648.483313.383942@emerger.yogotech.com> <3E74CC37.DF83EE46@bellatlantic.net> <15988.52765.777500.37926@emerger.yogotech.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="+JUInw4efm7IfTNU" Content-Disposition: inline In-Reply-To: <15988.52765.777500.37926@emerger.yogotech.com> User-Agent: Mutt/1.4i X-PGP-Key: finger seanc@FreeBSD.org X-PGP-Fingerprint: 3849 3760 1AFE 7B17 11A0 83A6 DD99 E31F BC84 B341 X-Web-Homepage: http://sean.chittenden.org/ Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --+JUInw4efm7IfTNU Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > > Yet another idea is to be able to make "local commits" with committing > > them to the central remote repository later. >=20 > I'd do the reverse, since the possibility of synchronization problems > are a huge deal. Imagine if someone 'snuck' in and made a commit in > the master tree after your local commit was made, but before 'later' > occurred and your cache pushed it out to the master tree. >=20 > If you only allow the commit if it can occur locally, you're ensuring > that the cache can't get out of date with local changes. I tried > something like the above (cause it was easier to implement), and it > worked most of the time. However, the times it didn't work it was a > royal pain in the *ss to cleanup and get the original commit back out. It'd be cool to teach CVSup to ignore updating certain files that have been marked locally as "dirty" or "in flux" until they've been committed through to the master repo. Even better would be to have CVSup ignore making changes to designated branches (RELENG_5_SEANC). The corollary to that would be to teach cvs(1) to commit changes to the master repo that have been made to the local repo. Version number sync would be a problem, but it'd be really cool to be able to do that. With a branch mapping layer (RELENG_5_SEANC -> HEAD), people could actually get back into the habit of using CVS as a development tool instead of just a way of publishing finalized work. Maybe the above changes could be rolled into the rewrite of CVSup in C. CVSup -> C ld cvsup -lkse cvsup(1) -> base system ::grin:: -sc --=20 Sean Chittenden --+JUInw4efm7IfTNU Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Comment: Sean Chittenden iD8DBQE+dNdO3ZnjH7yEs0ERAquTAJ95NC5Au5Et3mJ8PDDTaNSnrQPcggCeJNqj +wKleHhn2ctN2IvGV87J38Y= =v+3J -----END PGP SIGNATURE----- --+JUInw4efm7IfTNU-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message