From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/69608 Path: news.gmane.org!not-for-mail From: Ted Zlatanov 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 18:44:34 -0500 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <878w8hofj1.fsf@lifelogs.com> 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 1271807100 2428 80.91.229.12 (20 Apr 2010 23:45:00 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 20 Apr 2010 23:45:00 +0000 (UTC) Cc: ding@gnus.org, emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 21 01:44:59 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 1O4N7i-0001YZ-A3 for ged-emacs-devel@m.gmane.org; Wed, 21 Apr 2010 01:44:58 +0200 Original-Received: from localhost ([127.0.0.1]:39339 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4N7h-0004NC-QR for ged-emacs-devel@m.gmane.org; Tue, 20 Apr 2010 19:44:57 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O4N7a-0004LR-8O for emacs-devel@gnu.org; Tue, 20 Apr 2010 19:44:50 -0400 Original-Received: from [140.186.70.92] (port=53564 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4N7Z-0004KU-1t for emacs-devel@gnu.org; Tue, 20 Apr 2010 19:44:49 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O4N7W-00021t-9k for emacs-devel@gnu.org; Tue, 20 Apr 2010 19:44:48 -0400 Original-Received: from blockstar.com ([208.100.47.114]:36132 helo=mail.blockstar.com) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O4N7W-00021j-69 for emacs-devel@gnu.org; Tue, 20 Apr 2010 19:44:46 -0400 Original-Received: from heechee (c-98-227-29-141.hsd1.il.comcast.net [98.227.29.141]) by mail.blockstar.com (Postfix) with ESMTP id 72BECA680E0; Tue, 20 Apr 2010 18:44:49 -0500 (CDT) 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 "Tue, 20 Apr 2010 18:28:45 -0400") User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:123944 gmane.emacs.gnus.general:69608 Archived-At: On Tue, 20 Apr 2010 18:28:45 -0400 Stefan Monnier wrote: >> Git doesn't really do renames, but "git diff" will detect them if the >> deleted and the new file have the same content. SM> I know that's how it works. But I don't know what it means in terms of SM> the behavior when merging changes, including addition/removal of files. SM> IIUC it understands movement of files, but does it understand movement SM> of directories (e.g. if Gnus adds a new file lisp/gnus-new.el, will it SM> appear in Emacs as lisp/gnus/gnus-new.el or lisp/gnu-new.el?; similarly SM> if Emacs adds a new file lisp/new.el will it appear in Gnus as SM> lisp/new.el?). Sorry, I'm learning some dark corners of Git so I don't assume everyone knows how Git tracks blobs and indexes them. It's supposed to find the files by content across the tree, so a renamed file from either side *should* be tracked correctly. I'll have to try it to be sure. Assuming this rename tracking works well, new files will be managed by the Gnus synchronization maintainer. The Emacs side should be authoritative for new files, meaning that we (Gnus) will get lisp/new.el and have to remove it, and that we will push our lisp/gnus-new.el to your lisp/gnus/gnus-new.el. SM> I don't personally care whether the moves&removal&adds are done on the SM> Bzr or Git side. AFAIK it's as easy to do it on either side. It can SM> even be split into some part on one side and some other part on the SM> other side. Let's keep all the work on the Git side. I haven't heard anyone else recommend a better workflow than "all on the Git side" yet. So, assuming the above, you or Yidong will not do anything special. You just need to tell us which Emacs branches should be synchronized with the corresponding Gnus branches (let's keep the number down so it doesn't become too much work). I assume Emacs trunk will synchronize with Gnus trunk; what other branches do we need immediately? On the Gnus side I will experiment and try to develop a scripted procedure, but it should be readily usable by anyone. Thanks for your help Ted