From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: On the subject of Git, Bazaar, and the future of Emacs development Date: Wed, 27 Mar 2013 22:43:34 -0400 Message-ID: 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 1364438620 31235 80.91.229.3 (28 Mar 2013 02:43:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Mar 2013 02:43:40 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stephen Leake Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 28 03:44:07 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 1UL2ow-0000zX-0w for ged-emacs-devel@m.gmane.org; Thu, 28 Mar 2013 03:44:06 +0100 Original-Received: from localhost ([::1]:33326 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UL2oX-0001sU-C9 for ged-emacs-devel@m.gmane.org; Wed, 27 Mar 2013 22:43:41 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:52395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UL2oU-0001sE-3H for emacs-devel@gnu.org; Wed, 27 Mar 2013 22:43:38 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UL2oS-0003Gs-Ma for emacs-devel@gnu.org; Wed, 27 Mar 2013 22:43:38 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:37756) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UL2oS-0003Gi-Hh for emacs-devel@gnu.org; Wed, 27 Mar 2013 22:43:36 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EABK/CFFFxLSu/2dsb2JhbABEvw4Xc4IeAQEEAVYjEAs0EhQYDSSIHgbBLZEKA6R6gV6DEw X-IPAS-Result: Av4EABK/CFFFxLSu/2dsb2JhbABEvw4Xc4IeAQEEAVYjEAs0EhQYDSSIHgbBLZEKA6R6gV6DEw X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="5959472" Original-Received: from 69-196-180-174.dsl.teksavvy.com (HELO pastel.home) ([69.196.180.174]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 27 Mar 2013 22:43:33 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 03A5B678D0; Wed, 27 Mar 2013 22:43:34 -0400 (EDT) In-Reply-To: <85r4j0h1ww.fsf@member.fsf.org> (Stephen Leake's message of "Wed, 27 Mar 2013 19:13:19 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.182 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:158331 Archived-At: >> 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). Stefan