From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stephen Leake Newsgroups: gmane.emacs.devel Subject: Re: On the subject of Git, Bazaar, and the future of Emacs development Date: Thu, 28 Mar 2013 04:08:21 -0400 Message-ID: <8538vggd56.fsf@member.fsf.org> References: <87y5d9p5td.fsf@dex.adm.naquadah.org> <87vc8dtbcb.fsf@lifelogs.com> <871ub1gmdf.fsf@engster.org> <87d2ulovd0.fsf@dex.adm.naquadah.org> <85r4j0h1ww.fsf@member.fsf.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1364458127 31548 80.91.229.3 (28 Mar 2013 08:08:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Mar 2013 08:08:47 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 28 09:09:10 2013 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 1UL7tV-0007Z3-CR for ged-emacs-devel@m.gmane.org; Thu, 28 Mar 2013 09:09:09 +0100 Original-Received: from localhost ([::1]:36763 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UL7t6-0002Yj-Lp for ged-emacs-devel@m.gmane.org; Thu, 28 Mar 2013 04:08:44 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:54587) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UL7t3-0002Yd-FU for emacs-devel@gnu.org; Thu, 28 Mar 2013 04:08:42 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UL7t2-0002kr-8M for emacs-devel@gnu.org; Thu, 28 Mar 2013 04:08:41 -0400 Original-Received: from vms173013pub.verizon.net ([206.46.173.13]:50887) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UL7t2-0002km-42 for emacs-devel@gnu.org; Thu, 28 Mar 2013 04:08:40 -0400 Original-Received: from TAKVER ([unknown] [72.66.125.164]) by vms173013.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0MKD00FUE2LXN290@vms173013.mailsrvcs.net> for emacs-devel@gnu.org; Thu, 28 Mar 2013 03:08:37 -0500 (CDT) In-reply-to: (Stefan Monnier's message of "Wed, 27 Mar 2013 22:43:34 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (windows-nt) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.46.173.13 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:158341 Archived-At: Stefan Monnier writes: >>> The core of the problem is bidirectional merging. >> If I understand what you mean by "bidirectional merging", then monotone >> handles it nicely (http://www.monotone.ca/). > > By bidirectional merging, I mean that you have two parallel branches > that should be kept in sync, so that any commit on branch A should be > sync'd to branch B and vice versa. Yet branch A and branch B are not > identical (there's a "constant" diff between the two). Ah. That is not what I thought. A use case for this would be support for old Emacs versions in the upstream of an Emacs feature, but only the current Emacs in the Emacs trunk. monotone does not handle that directly; it would be an interesting feature to add. But it would make more sense to add it to git. -- -- Stephe