From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Switching to bzr: what remains to be done? Date: Mon, 08 Dec 2008 22:32:15 -0500 Message-ID: References: <87vdtu332o.fsf@red-bean.com> <87hc5ef9mf.fsf@notengoamigos.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1228793554 1752 80.91.229.12 (9 Dec 2008 03:32:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 9 Dec 2008 03:32:34 +0000 (UTC) Cc: Karl Fogel , emacs-devel@gnu.org To: Jason Earl Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Dec 09 04:33:36 2008 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 1L9tLs-00059j-DD for ged-emacs-devel@m.gmane.org; Tue, 09 Dec 2008 04:33:36 +0100 Original-Received: from localhost ([127.0.0.1]:51045 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L9tKh-0005LX-Eu for ged-emacs-devel@m.gmane.org; Mon, 08 Dec 2008 22:32:23 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L9tKc-0005L9-O2 for emacs-devel@gnu.org; Mon, 08 Dec 2008 22:32:18 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L9tKb-0005KE-UM for emacs-devel@gnu.org; Mon, 08 Dec 2008 22:32:18 -0500 Original-Received: from [199.232.76.173] (port=53871 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L9tKb-0005Js-LV for emacs-devel@gnu.org; Mon, 08 Dec 2008 22:32:17 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:23343) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1L9tKb-0007Ze-Bo for emacs-devel@gnu.org; Mon, 08 Dec 2008 22:32:17 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AsQEAAd1PUlLd+Db/2dsb2JhbACBbM1PgwWBJg X-IronPort-AV: E=Sophos;i="4.33,738,1220241600"; d="scan'208";a="30813861" Original-Received: from 75-119-224-219.dsl.teksavvy.com (HELO pastel.home) ([75.119.224.219]) by ironport2-out.teksavvy.com with ESMTP; 08 Dec 2008 22:32:16 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id ABA528219; Mon, 8 Dec 2008 22:32:15 -0500 (EST) In-Reply-To: <87hc5ef9mf.fsf@notengoamigos.org> (Jason Earl's message of "Mon, 08 Dec 2008 17:57:44 -0700") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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:106706 Archived-At: > Actually the repository that is incremental is: > http://bzr.notengoamigos.org/emacs/trunk/ Sorry, that was a typo, yes. >> - includes renames. Apparently none of the conversion tools provide >> that since the info is only available in the Arch repository right >> now, but that has commits that bundle up several CVS commit into one. > I do have an import of the Arch repository, but I wouldn't recommend it > as it throws away most of the CVS revision history. I have no idea how > you would go about trying to merge the Arch information into one of the > other repositories. I don't either. Andreas somehow manages to extract the merge info from the Arch archive and mix it up with the CVS data to generate&update its Git repository. Not sure if something similar can be done for the renames. >> - is complete. The http://bzr.notengoamigos.org/emacs-merges/trunk/ >> seems to have some missing elements (IIRC a few CVS tags were >> missing). > I think that this could easily be fixed. Could you give an example from > emacs-merges? I meant the http://bzr.notengoamigos.org/emacs/trunk/ branch, sorry. As far as I can tell the emacs-merges branch is complete. >> Another issue that AFAIK nobody has worked on, is how are we going to >> handle the Gnus<->Emacs synchronization in the future. I expect this to >> be doable somehow, maybe by still going through Arch, but of course it >> would probably be preferable to do it directly within Bzr, and in any >> case it will require for someone to figure it out. > I don't know how this works so it is hard to comment :). I think it works pretty much as follows (except in Arch). To set things up, the following was done once: - cd .../emacs - bzr pull - bzr merge bzr://.../gnus - tons of random bogus conflicts, resolve them somehow at this point, the VCS (i.e. hopefully Bzr can do it, Arch clearly does) has figure out that Gnus's "lisp/gnus.el" corresponds to Emacs's "lisp/gnus/gnus.el" and things like that, so you can then subsequently treat the two repositories as two branches of the same code, just where one holds a lot more files than the other. So you can do - bzr merge bzr://.../gnus and changes will properly get merged into the right files. Now of course, I don't know how the two-way sync can work, I'm not even sure how Miles does it for Arch. > Unfortunately updating from CVS and getting the merge info seem to be > mutually exclusive. Clearly Andreas manages to do it, so there should be a way to do that for Bzr as well. Stefan