From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.gnus.general,gmane.emacs.devel Subject: Re: The Gnus repository is switching to Git as of 2010-04-19 Date: Tue, 20 Apr 2010 08:55:39 -0500 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <87fx2qgrdw.fsf@lifelogs.com> References: <878w8jmjly.fsf@lifelogs.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" X-Trace: dough.gmane.org 1271771847 22516 80.91.229.12 (20 Apr 2010 13:57:27 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 20 Apr 2010 13:57:27 +0000 (UTC) Cc: , To: Stefan Monnier Original-X-From: ding-owner+M17990@lists.math.uh.edu Tue Apr 20 15:57:21 2010 connect(): No such file or directory Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1O4Dwy-0001Sr-2e for ding-account@gmane.org; Tue, 20 Apr 2010 15:57:16 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1O4Dw2-00080d-4f; Tue, 20 Apr 2010 08:56:18 -0500 Original-Received: from mx2.math.uh.edu ([129.7.128.33]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1O4Dw0-00080R-8w for ding@lists.math.uh.edu; Tue, 20 Apr 2010 08:56:16 -0500 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx2.math.uh.edu with esmtp (Exim 4.69) (envelope-from ) id 1O4Dvx-0005ZB-FE for ding@lists.math.uh.edu; Tue, 20 Apr 2010 08:56:14 -0500 Original-Received: from chirelay1o.jumptrading.com ([38.98.147.153] helo=chirelay1.jumptrading.com) by quimby.gnus.org with esmtp (Exim 3.36 #1 (Debian)) id 1O4Dvw-0006hx-00 for ; Tue, 20 Apr 2010 15:56:12 +0200 Original-Received: from chirelay1.jumptrading.com (unknown [127.0.0.1]) by chirelay1.jumptrading.com (Symantec Mail Security) with ESMTP id AC326320014 for ; Tue, 20 Apr 2010 08:55:41 -0500 (CDT) X-AuditID: 26629395-a6b7cbb00000350f-d1-4bcdb25d891a Original-Received: from chiexchange02.w2k.jumptrading.com (unknown [38.98.147.140]) by chirelay1.jumptrading.com (Symantec Mail Security) with ESMTP id 8E5832DC006 for ; Tue, 20 Apr 2010 08:55:41 -0500 (CDT) Original-Received: from internalsmtp.w2k.jumptrading.com (10.2.4.29) by chiexchange02.w2k.jumptrading.com (10.2.4.71) with Microsoft SMTP Server id 8.1.291.1; Tue, 20 Apr 2010 08:55:41 -0500 Original-Received: from tzlatanov-ubuntu-desktop.jumptrading.com ([10.2.13.58]) by internalsmtp.w2k.jumptrading.com with Microsoft SMTPSVC(6.0.3790.1830); Tue, 20 Apr 2010 08:55:41 -0500 X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6;d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" In-Reply-To: (Stefan Monnier's message of "Mon, 19 Apr 2010 14:50:03 -0400") User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/24.0.50 (gnu/linux) X-OriginalArrivalTime: 20 Apr 2010 13:55:41.0090 (UTC) FILETIME=[29DFE820:01CAE091] X-Brightmail-Tracker: AAAAAA== X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:69599 gmane.emacs.devel:123913 Archived-At: On Mon, 19 Apr 2010 14:50:03 -0400 Stefan Monnier wrote: SM> Here is the way I imagine it might work: SM> - take an Emacs Bzr branch. SM> - massage it with "bzr mv", "bzr rm", and "bzr add" to make it look SM> exactly like the corresponding revision in Gnus's Git. SM> - call it "Gnus Bzr branch". SM> - then use magic to make this Gnus Bzr branch sync bidirectionally with SM> the corresponding Git branch. SM> We should then be able to use manually "bzr merge" from the Emacs Bzr SM> branch to the Gnus Bzr branch and vice versa without too much pain (tho SM> it will suffer from many spurious conflicts on files that are in one SM> branch but not in the other, so some extra scripting will be helpful to SM> ease the pain). SM> If someone knows a magician that can take care of the Bzr<->Git part, SM> I'm all ears. I asked Carsten (org-mode) for guidance as he does something similar. git-bzr supports push and pull (bzr-git only supports pull) so maybe it makes sense to put the magic on the Git side. In that case it may also make sense to set up the "for-emacs" synchronization branch inside Gnus and simply pull all the commits out of Bazaar for a specific set of files. IOW, instead of massaging the file locations in the for-emacs branch, I could assemble a map of "gnus-file-name <-> emacs-file-name" for all the files that need to be synchronized and then only look at commits that involve those files. So the "magic" would not only synchronize but also translate and make rearranging the files unnecessary. I don't know which approach is best, honestly, so Carsten's opinion will be valuable in addition to yours and anyone else willing to help. Katsumi Yamaoka and Miles Bader, especially, may have interesting views as they've worked on this synchronization with the CVS side. Ted