From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.devel Subject: Re: bzr repository ready? Date: Wed, 21 Jan 2009 00:11:17 -0500 Message-ID: <87bpu1451m.fsf@red-bean.com> References: <871vviif6s.fsf@xemacs.org> <87mye6xnsr.fsf@xemacs.org> <87y6xpvyz6.fsf@xemacs.org> <87zli4jcc4.fsf@workhorse.earlhome> <87vdsrjcco.fsf@workhorse.earlhome> <87fxjgb4ud.fsf_-_@red-bean.com> <87eiyy3lag.fsf@notengoamigos.org> Reply-To: Karl Fogel NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1232514738 1617 80.91.229.12 (21 Jan 2009 05:12:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 21 Jan 2009 05:12:18 +0000 (UTC) Cc: Juanma Barranquero , Eli Zaretskii , "Stephen J. Turnbull" , Stefan Monnier , emacs-devel@gnu.org To: Jason Earl Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 21 06:13:30 2009 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1LPVP4-0004DA-T2 for ged-emacs-devel@m.gmane.org; Wed, 21 Jan 2009 06:13:27 +0100 Original-Received: from localhost ([127.0.0.1]:36055 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LPVNn-0005B6-ER for ged-emacs-devel@m.gmane.org; Wed, 21 Jan 2009 00:12:07 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LPVN7-0004mR-1q for emacs-devel@gnu.org; Wed, 21 Jan 2009 00:11:25 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LPVN5-0004l0-E6 for emacs-devel@gnu.org; Wed, 21 Jan 2009 00:11:24 -0500 Original-Received: from [199.232.76.173] (port=48618 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LPVN5-0004ks-85 for emacs-devel@gnu.org; Wed, 21 Jan 2009 00:11:23 -0500 Original-Received: from sanpietro.red-bean.com ([66.146.193.61]:54425) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LPVN3-0000Ii-49; Wed, 21 Jan 2009 00:11:21 -0500 Original-Received: from localhost ([127.0.0.1]:53606 helo=floss ident=kfogel) by sanpietro.red-bean.com with esmtp (Exim 4.69) (envelope-from ) id 1LPVN0-0003i4-FU; Tue, 20 Jan 2009 23:11:18 -0600 In-Reply-To: <87eiyy3lag.fsf@notengoamigos.org> (Jason Earl's message of "Mon, 19 Jan 2009 16:53:27 -0700") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:108025 Archived-At: Jason Earl writes: > The problem with the emacs-merges repository is that the process I use > to create it is a one time process. That particular bzr repository is > based off of Andreas Schwab's git repository at git://repo.or.cz/emacs. > I import the repository using a gently modified bzr fastimport plugin > (on a machine with enough memory you probably could use the stock > fastimport plugin). This process is incremental as long as the git repo > doesn't have its history re-written, but that's precisely what Andreas' > import process does to put in the merge information. > > In short, I can create a new version of the repository at will (well, it > takes 24 hours or so, but you get the idea), but the repository will be > completely useless for actual development work because I can't update it > with changes from CVS. I can only create a new repository and existing > branches branched from the old repository will believe that they don't > share any common ancestors with the new repository. But if you could recreate a new version of the bzr repository from a recently refreshed version of Andreas's git repository (that is, a git repository very recently derived from the CVS master), then we'd be ready to go, right? (If a few CVS commits sneak in during the conversion, we could just replay them into bzr later. Or we could just lock up the CVS repository during the conversion; I really think that for a one-time event like this, that's fine -- a mild inconvenience at most.) I mean, let's remember, this is a *switchover* :-). After it's done, none of us will be using CVS for Emacs anymore. > When I originally made the first of the bzr conversions I got quite a > bit of negative feedback about Bazaar and the usefulness of Bazaar as a > distributed VCS. So I wanted to make it perfectly clear that the > repository was unofficial. I think that's not a worry now. Bzr has come a long way since then, and our decision to use bzr still holds. We just need to make it happen now. > That being the case, I really think that the emacs-merges repository > represents the best conversion possible. I've done conversions using > cvsps_import, and fast import conversions from both cvs2svn and from > Andreas' git repository. Andreas' git repository is the only way to get > the merge information (basically he's hacked it in by hand). So, let's figure this out: Do we need to coordinate with Andreas to do the real-life conversion? Andreas, if so, are you listening and willing? Jason, assuming Andreas is willing, are you ready to do one more conversion? Stefan et al, is Savannah ready to host our "master" bzr repository? I think we're close now. Let's do these final steps... -Karl