From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.devel Subject: Re: patch vs. overwrite in bzr Date: Sun, 08 Apr 2012 11:52:07 -0400 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <878vi6p6fs.fsf@lifelogs.com> References: <87k42cwys8.fsf@gnu.org> <87398lgrat.fsf_-_@niu.edu> <871uo5c7r0.fsf@wanadoo.es> <87pqbpj5j3.fsf@altern.org> <87aa2szgig.fsf@gnu.org> <87ehs4yrhz.fsf@gnu.org> <83k41vctyg.fsf@gnu.org> <83aa2rcnww.fsf@gnu.org> <8362dedgcb.fsf@gnu.org> <87zkapi7qe.fsf@gnu.org> <878vi79a3k.fsf@gnu.org> Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1333900346 13375 80.91.229.3 (8 Apr 2012 15:52:26 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 8 Apr 2012 15:52:26 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 08 17:52:26 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SGuPh-0003Rg-42 for ged-emacs-devel@m.gmane.org; Sun, 08 Apr 2012 17:52:25 +0200 Original-Received: from localhost ([::1]:59135 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SGuPg-0004nz-I8 for ged-emacs-devel@m.gmane.org; Sun, 08 Apr 2012 11:52:24 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:38130) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SGuPd-0004ns-Ml for emacs-devel@gnu.org; Sun, 08 Apr 2012 11:52:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SGuPc-0002HQ-2M for emacs-devel@gnu.org; Sun, 08 Apr 2012 11:52:21 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:48104) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SGuPb-0002HB-R4 for emacs-devel@gnu.org; Sun, 08 Apr 2012 11:52:19 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1SGuPY-0003M3-5C for emacs-devel@gnu.org; Sun, 08 Apr 2012 17:52:16 +0200 Original-Received: from c-76-28-40-19.hsd1.vt.comcast.net ([76.28.40.19]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 08 Apr 2012 17:52:15 +0200 Original-Received: from tzz by c-76-28-40-19.hsd1.vt.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 08 Apr 2012 17:52:15 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 20 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: c-76-28-40-19.hsd1.vt.comcast.net 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" Mail-Copies-To: never User-Agent: Gnus/5.130004 (Ma Gnus v0.4) Emacs/24.0.95 (gnu/linux) Cancel-Lock: sha1:lEnZNsUeEWTLjEQp7O2I1nU244w= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:149481 Archived-At: On Sat, 07 Apr 2012 23:25:41 -0400 Richard Stallman wrote: RS> For other things, having them in Org's repo makes sense, because it RS> is a central place for anything related to Org. RS> Is it possible to have two repositories that partly overlap RS> and partly don't? I would think that it ought to be possible RS> with a DVCS. Yes, but it's very hard to keep them synchronized without a merge manager, especially if you have to convert between Git and Bazaar. For Gnus we have Yamaoka-san who keeps us sane, doing the merges in a semi-automatic way. I tried to get something automatic between Gnus and Emacs working last year and was unable to convince Bazaar to do what I wanted, after a few days of hacking. Perhaps it's a matter of training and dedication I lacked; if anyone has *automated* the merge workflow between Git and Bazaar for two large, partially overlapping and with many files renamed, repositories, I'd love to know how it can be done. Ted