From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/69607 Path: news.gmane.org!not-for-mail From: Stefan Monnier 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 18:28:45 -0400 Message-ID: References: <878w8jmjly.fsf@lifelogs.com> <87fx2qgrdw.fsf@lifelogs.com> <878w8hevp6.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 1271802579 21779 80.91.229.12 (20 Apr 2010 22:29:39 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 20 Apr 2010 22:29:39 +0000 (UTC) Cc: , To: Ted Zlatanov Original-X-From: ding-owner+M17998@lists.math.uh.edu Wed Apr 21 00:29:37 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 1O4Lwm-0008R8-MV for ding-account@gmane.org; Wed, 21 Apr 2010 00:29:36 +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 1O4LwF-0001uN-UW; Tue, 20 Apr 2010 17:29:03 -0500 Original-Received: from mx1.math.uh.edu ([129.7.128.32]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1O4LwD-0001u3-Vv for ding@lists.math.uh.edu; Tue, 20 Apr 2010 17:29:01 -0500 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx1.math.uh.edu with esmtp (Exim 4.69) (envelope-from ) id 1O4LwB-00039b-H3 for ding@lists.math.uh.edu; Tue, 20 Apr 2010 17:29:00 -0500 Original-Received: from tomts10.bellnexxia.net ([209.226.175.54] helo=tomts10-srv.bellnexxia.net) by quimby.gnus.org with esmtp (Exim 3.36 #1 (Debian)) id 1O4LwA-00052p-00 for ; Wed, 21 Apr 2010 00:28:58 +0200 Original-Received: from toip3.srvr.bell.ca ([209.226.175.86]) by tomts10-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20100420222852.VHTO307.tomts10-srv.bellnexxia.net@toip3.srvr.bell.ca> for ; Tue, 20 Apr 2010 18:28:52 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvsEAA3IzUtGN5OL/2dsb2JhbACcDXK+boUPBA 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 18:20:59 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 64260660D2; Tue, 20 Apr 2010 18:28:45 -0400 (EDT) In-Reply-To: <878w8hevp6.fsf@lifelogs.com> (Ted Zlatanov's message of "Tue, 20 Apr 2010 15:05:25 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:69607 gmane.emacs.devel:123940 Archived-At: > Git doesn't really do renames, but "git diff" will detect them if the > deleted and the new file have the same content. I know that's how it works. But I don't know what it means in terms of the behavior when merging changes, including addition/removal of files. IIUC it understands movement of files, but does it understand movement of directories (e.g. if Gnus adds a new file lisp/gnus-new.el, will it appear in Emacs as lisp/gnus/gnus-new.el or lisp/gnu-new.el?; similarly if Emacs adds a new file lisp/new.el will it appear in Gnus as lisp/new.el?). I don't personally care whether the moves&removal&adds are done on the Bzr or Git side. AFAIK it's as easy to do it on either side. It can even be split into some part on one side and some other part on the other side. > A likely problem will be merging a specific Emacs branch bidirectionally > to a specific Gnus branch. So far I've only done it for Gnus trunk > vs. Emacs trunk. It should be just as easy for a branch as for the trunk. Stefan