From owner-freebsd-hackers Sun Mar 16 15:21:38 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 5B06137B404 for ; Sun, 16 Mar 2003 15:21:36 -0800 (PST) Received: from ns.yogotech.com (ns.yogotech.com [206.127.123.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63D2143F93 for ; Sun, 16 Mar 2003 15:21:32 -0800 (PST) (envelope-from nate@yogotech.com) Received: from emerger.yogotech.com (emerger.yogotech.com [206.127.123.131]) by ns.yogotech.com (8.9.3/8.9.3) with ESMTP id QAA22211; Sun, 16 Mar 2003 16:21:27 -0700 (MST) (envelope-from nate@yogotech.com) Received: (from nate@localhost) by emerger.yogotech.com (8.12.6/8.12.6) id h2GNLQLx013162; Sun, 16 Mar 2003 16:21:26 -0700 (MST) (envelope-from nate) From: Nate Williams MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <15989.1782.166458.477601@emerger.yogotech.com> Date: Sun, 16 Mar 2003 16:21:26 -0700 To: Terry Lambert Cc: Sean Chittenden , Nate Williams , Sergey Babkin , hackers@FreeBSD.ORG Subject: Re: making CVS more convenient In-Reply-To: <3E75010D.EEA8B4D@mindspring.com> References: <3E73DCF7.80490FA6@bellatlantic.net> <15988.49648.483313.383942@emerger.yogotech.com> <3E74CC37.DF83EE46@bellatlantic.net> <15988.52765.777500.37926@emerger.yogotech.com> <20030316195807.GH66903@perrin.int.nxad.com> <3E75010D.EEA8B4D@mindspring.com> X-Mailer: VM 7.07 under 21.1 (patch 14) "Cuyahoga Valley" XEmacs Lucid Reply-To: nate@yogotech.com (Nate Williams) 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 > > 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. > > Nate's suggestion covers the version number issue... sort of. It > assumes that the patches will be approved for commit to the main > repo This is easy to get around, b/c if the commit doesn't happen successfully on the repo, then the commit fails, and as such it also won't also be committed to the local branch (the remote commit failed). > and it assumes that the main repo will not get tagged in > between. For *most* users, this is not a problem. My solution is for the developer. However, it's not intended to make the local cache a complete mirror of the remote repository. That is a whole 'nother project. :) > The main problem with that is pretty obvious, especially > around code-freeze/code-slush, but also for anyone without a commit > bit, or who is being "mentored", and so lacks the ability to "just > commit". Even during code-freeze, it does allow you to everything you *need* to do safely. If you attempt a commit and your local cache isn't up-to-date, then the commit will fail, and the user will have to re-sychronize their repository. Fortunately, this is a mostly rare occurance, especially if there are regular scheduled synchronization occurances (aka; nightly cron jobs). > A more minor problem is that it replaced the version conflict with a > "$FreeBSD$" conflict that CVSup has to ignore. See above. This is mostly a non-issue as long as the versions are kept up-to-date. No merges will be attempted what-so-ever, even if they would not necessarily cause conflicts. However, this is all a pipe-dream, although Sergey's work is making it less pie-in-the-sky. The other solution to the problem is the P4 route. Making things so darn effecient that there's little need to have a local mirror. Where this falls down is when the remote developer doesn't have a 24x7 connection to the main repository. From what I've been told ClearCase allows for 'mirrored read-only' repositories similar to what most of the open-source CVS developers have been doing with sup/CVSup for years, although it's nowhere near as effecient as CVSup at creating snapshots. Nate To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message