From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/69601 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel,gmane.emacs.gnus.general Subject: Re: The Gnus repository is switching to Git as of 2010-04-19 Date: Tue, 20 Apr 2010 11:00:18 -0400 Message-ID: References: <878w8jmjly.fsf@lifelogs.com> <87fx2qgrdw.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 1271775633 6289 80.91.229.12 (20 Apr 2010 15:00:33 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 20 Apr 2010 15:00:33 +0000 (UTC) Cc: ding@gnus.org, emacs-devel@gnu.org To: Ted Zlatanov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 20 17:00:31 2010 connect(): No such file or directory 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.69) (envelope-from ) id 1O4EwB-0004xX-G8 for ged-emacs-devel@m.gmane.org; Tue, 20 Apr 2010 17:00:31 +0200 Original-Received: from localhost ([127.0.0.1]:41344 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4EwA-0004Wu-Rk for ged-emacs-devel@m.gmane.org; Tue, 20 Apr 2010 11:00:30 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O4Ew5-0004Wp-LG for emacs-devel@gnu.org; Tue, 20 Apr 2010 11:00:25 -0400 Original-Received: from [140.186.70.92] (port=45591 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4Ew2-0004Wh-Vw for emacs-devel@gnu.org; Tue, 20 Apr 2010 11:00:24 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O4Ew0-0004rk-JX for emacs-devel@gnu.org; Tue, 20 Apr 2010 11:00:22 -0400 Original-Received: from tomts5-srv.bellnexxia.net ([209.226.175.25]:50446) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O4Ew0-0004rU-Ah for emacs-devel@gnu.org; Tue, 20 Apr 2010 11:00:20 -0400 Original-Received: from toip3.srvr.bell.ca ([209.226.175.86]) by tomts5-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20100420150018.ICU6410.tomts5-srv.bellnexxia.net@toip3.srvr.bell.ca> for ; Tue, 20 Apr 2010 11:00:18 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvsEAItezUtGN5OL/2dsb2JhbACcAHK9V4UPBA Original-Received: from bas1-montreal42-1178047371.dsl.bell.ca (HELO ceviche.home) ([70.55.147.139]) by toip3.srvr.bell.ca with ESMTP; 20 Apr 2010 10:52:32 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 328F7660D2; Tue, 20 Apr 2010 11:00:18 -0400 (EDT) In-Reply-To: <87fx2qgrdw.fsf@lifelogs.com> (Ted Zlatanov's message of "Tue, 20 Apr 2010 08:55:39 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Solaris 8 (1) 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:123917 gmane.emacs.gnus.general:69601 Archived-At: > git-bzr supports push and pull (bzr-git only supports pull) so maybe it > makes sense to put the magic on the Git side. git-bzr might be a good choice for the "magic" part, yes. > 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. The "rearranging the files" is a simple way to "write" the map of "gnus-file-name <-> emacs-file-name". Bzr handles file renaming very well, so if you do the renaming on the Bzr side, I think it'll work OK. It doesn't handle removals as well (resulting in conflicts when you merge changes to the removed file), but it shouldn't be too hard to cook up a script which will resolve those conflicts automatically. Since this will involve renaming of all files, the support for renaming will be important. If Git handles renames as well as Bzr in such a case, then it doesn't matter where you do the renaming (on the Git or the Bzr side). Stefan