From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jason Earl Newsgroups: gmane.comp.version-control.bazaar-ng.general,gmane.emacs.devel Subject: Re: Emacs Bazaar repository Date: Fri, 14 Mar 2008 12:35:02 -0600 Message-ID: <87iqzpw3vt.fsf@xmission.com> References: <87skyvse7k.fsf@xmission.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1205519724 9394 80.91.229.12 (14 Mar 2008 18:35:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 14 Mar 2008 18:35:24 +0000 (UTC) Cc: bazaar@lists.canonical.com, emacs-devel@gnu.org To: Stefan Monnier Original-X-From: bazaar-bounces@lists.canonical.com Fri Mar 14 19:35:50 2008 Return-path: Envelope-to: gcvbg-bazaar-ng@m.gmane.org Original-Received: from chlorine.canonical.com ([91.189.94.204]) by lo.gmane.org with esmtp (Exim 4.50) id 1JaEks-0005YB-A6 for gcvbg-bazaar-ng@m.gmane.org; Fri, 14 Mar 2008 19:35:46 +0100 Original-Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1JaEkI-0002pG-Ri; Fri, 14 Mar 2008 18:35:10 +0000 Original-Received: from out01.mta.xmission.com ([166.70.13.231]) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1JaEkG-0002op-8F for bazaar@lists.canonical.com; Fri, 14 Mar 2008 18:35:08 +0000 Original-Received: from [166.70.13.201] (helo=mgr1.xmission.com) by out01.mta.xmission.com with esmtp (Exim 4.62) (envelope-from ) id 1JaEkI-0001em-Rb; Fri, 14 Mar 2008 12:35:10 -0600 Original-Received: from jearl.fttp.xmission.com ([166.70.233.10] helo=workhorse.earlhome) by mgr1.xmission.com with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32) (Exim 4.50) id 1JaEkE-0002Ys-6H; Fri, 14 Mar 2008 12:35:07 -0600 Original-Received: from nat.visiongrp.com ([65.162.166.20] helo=jearl-laptop) by workhorse.earlhome with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1JaEkE-0003ld-S1; Fri, 14 Mar 2008 12:35:06 -0600 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAAAAAByaaZbAAAACXBIWXMAABKbAAASmwHgklkM AAABz0lEQVRIx5VW2bHDIAz0jPtRS+pxG1E/fEUHhzjeC2EcJ8JZ0LFa80AkrrgB6L/0K0ypc3Y9 UqYh0I9eOtzG8hwPdkARJiJmOQBk20Ft0OuDcANA/78jdpd2AL99sFy4NDbQLVrsCbAEXYA3DVzE 8D/gkNbJpZsdhHMMN2kdAOKrSo8ttNZrTrYdnEgVweWu0p5b5vjrwSXxoSv73dIibaoSu/4u/vyB sxyD/9YCiE7IRrOP9M4uSK1OrcgOkANA2+PVBsHfQU8AbafRH8e0LoBUSDn2w+JiJiOXi6AngBx7 erYTF42M3wDYAFvH/erSGlNZg/7q0s9pLR1xLNyJGqo8xo2Qzm918AW0etoeQcMHldaDz43STnru k9Lo3XslGgeLidQ/Is0l3bJKkDQ71L7GZGY8DqlEF4l4oSQRMIBQT5JnadSSom8nmZEk/xxinLSR XcgoUyHhbQ8DZHZh1la298tKDaF5ZhXjjd6YALvczwB1SX4CWOGWGGRySQ79kGesmtNLUdOUFkDU gceCp9cuEj6ogYbgqHSzyYW59MKY9EUDqbrTyyGF6eiA2g+6gtoUZKr90A8jlXzL4STZTz3aoN3Q zkNx7unnn3YC+gA3WfRuzLleFgAAAEV6VFh0Q29tbWVudAAAeNpT8MxNTE9VSE/NSy1KLElNUUiq VHD3C1Vwz8gvLilOLsosKFHQSEkty0xOtS3Iyy1KLNfkAgDinBJPV21RsgAAABp6VFh0SlBFRy1D b2xvcnNwYWNlAAB42jMEAAAyADKxisffAAAAInpUWHRKUEVHLVNhbXBsaW5nLWZhY3RvcnMAAHja M6wwBAABtwDbWB23uwAAAABJRU5ErkJggg== In-Reply-To: (Stefan Monnier's message of "Fri, 14 Mar 2008 14:08:00 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) Received-SPF: neutral (mgr1.xmission.com: 166.70.233.10 is neither permitted nor denied by domain of xmission.com) client-ip=166.70.233.10; envelope-from=jearl@xmission.com; helo=workhorse.earlhome; X-SA-Exim-Connect-IP: 166.70.233.10 X-SA-Exim-Mail-From: jearl@xmission.com X-Spam-DCC: XMission; sa01 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on sa01.xmission.com X-Spam-Level: X-Spam-Status: No, score=-4.4 required=8.0 tests=ALL_TRUSTED,BAYES_00, DCC_CHECK_NEGATIVE, T_TM2_M_HEADER_IN_MSG, XM_SPF_Neutral autolearn=disabled version=3.2.4 X-Spam-Report: * -1.8 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.0 T_TM2_M_HEADER_IN_MSG BODY: T_TM2_M_HEADER_IN_MSG * -2.6 BAYES_00 BODY: Bayesian spam probability is 0 to 1% * [score: 0.0000] * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa01 1397; Body=1 Fuz1=1 Fuz2=1] * 0.0 XM_SPF_Neutral SPF-Neutral X-SA-Exim-Version: 4.2 (built Thu, 03 Mar 2005 10:44:12 +0100) X-SA-Exim-Scanned: Yes (on mgr1.xmission.com) X-BeenThere: bazaar@lists.canonical.com X-Mailman-Version: 2.1.8 Precedence: list List-Id: bazaar discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bazaar-bounces@lists.canonical.com Errors-To: bazaar-bounces@lists.canonical.com Xref: news.gmane.org gmane.comp.version-control.bazaar-ng.general:38601 gmane.emacs.devel:92598 Archived-At: Stefan Monnier writes: >> After a few false starts I have been successful (at least as far as I >> can tell) in importing the Emacs CVS repository into Bazaar. If anyone >> is interested in playing with the results you can check out the HEAD of >> the CVS repository with: > >> bzr clone http://bzr.notengoamigos.org/emacs/trunk/ > > Other than issues of performance, one of the missing elements in this > repository is all the merge information. Yeah, I didn't notice that until people started talking about bzr log and I realized that it wasn't showing the merge information. > Most of the merges we've done have been done via Arch. IIUC people > have been able to retrofit this info into the Git tree, and I think > it'd be very worthwhile to retrofit it into the Bzr tree. If someone knows how the folks that made the git repository did this maybe I could work something out. Or possibly I could take another whack at creating a bzr repository from the git repository instead of from CVS. Alternatively, I could experiment with creating a bzr repository from arch. Where are those branches located? > How can we add the merge info into the above Bzr tree? I've certainly got some things I can try. Jason