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 09:39:43 -0400 Message-ID: References: <87y5d9p5td.fsf@dex.adm.naquadah.org> <87vc8dtbcb.fsf@lifelogs.com> <871ub1gmdf.fsf@engster.org> <87d2ulovd0.fsf@dex.adm.naquadah.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1364391600 13570 80.91.229.3 (27 Mar 2013 13:40:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 Mar 2013 13:40:00 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Mar 27 14:40:27 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 1UKqaR-0004Zf-AH for ged-emacs-devel@m.gmane.org; Wed, 27 Mar 2013 14:40:19 +0100 Original-Received: from localhost ([::1]:40199 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKqa3-0002xI-9H for ged-emacs-devel@m.gmane.org; Wed, 27 Mar 2013 09:39:55 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:43138) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKqZz-0002uB-LN for emacs-devel@gnu.org; Wed, 27 Mar 2013 09:39:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKqZt-0006vB-AM for emacs-devel@gnu.org; Wed, 27 Mar 2013 09:39:51 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:12602) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKqZt-0006tl-65 for emacs-devel@gnu.org; Wed, 27 Mar 2013 09:39:45 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EABK/CFFFxLSu/2dsb2JhbABEvw4Xc4IeAQEEAVYzCzQSFBgNiEIGDMEhjWGDKQOkeoFegxM X-IPAS-Result: Av4EABK/CFFFxLSu/2dsb2JhbABEvw4Xc4IeAQEEAVYzCzQSFBgNiEIGDMEhjWGDKQOkeoFegxM X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="5899499" 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 09:39:41 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 5FA42678D0; Wed, 27 Mar 2013 09:39:43 -0400 (EDT) In-Reply-To: <87d2ulovd0.fsf@dex.adm.naquadah.org> (Julien Danjou's message of "Wed, 27 Mar 2013 13:55:23 +0100") 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:158301 Archived-At: >> Well, I don't believe that git will make cross-project merges easier, at >> least not until someone shows me how (and don't just say "submodules", >> please ;-) ). > I'm pretty sure it does make this easier: > http://git-scm.com/book/en/Git-Tools-Subtree-Merging The core of the problem is bidirectional merging. AFAIK none of the current DVCS have an answer for that. Subtree merging is nice, but it's still unidirectional. For bidirectional merging, you end up having to do some of the work outside of the DVCS proper, in which case having Bazaar on one side and Git on the other doesn't make much difference. Especially since you can use things like bzr-git to translate a branch from one system to the other. Stefan