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: Wed, 27 Mar 2013 19:13:19 -0400 Message-ID: <85r4j0h1ww.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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1364426038 24306 80.91.229.3 (27 Mar 2013 23:13:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 Mar 2013 23:13:58 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 28 00:14:25 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 1UKzXz-0006sI-8I for ged-emacs-devel@m.gmane.org; Thu, 28 Mar 2013 00:14:23 +0100 Original-Received: from localhost ([::1]:51582 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKzXb-0005da-0c for ged-emacs-devel@m.gmane.org; Wed, 27 Mar 2013 19:13:59 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:37993) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKzXX-0005dI-Ab for emacs-devel@gnu.org; Wed, 27 Mar 2013 19:13:56 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKzXW-0006LG-5K for emacs-devel@gnu.org; Wed, 27 Mar 2013 19:13:55 -0400 Original-Received: from vms173001pub.verizon.net ([206.46.173.1]:56224) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKzXW-0006Kb-0n for emacs-devel@gnu.org; Wed, 27 Mar 2013 19:13:54 -0400 Original-Received: from TAKVER ([unknown] [72.66.125.164]) by vms173001.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0MKC008HSDU7IX80@vms173001.mailsrvcs.net> for emacs-devel@gnu.org; Wed, 27 Mar 2013 18:13:35 -0500 (CDT) In-reply-to: (Stefan Monnier's message of "Wed, 27 Mar 2013 09:39:43 -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.1 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:158328 Archived-At: Stefan Monnier writes: >>> 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. If I understand what you mean by "bidirectional merging", then monotone handles it nicely (http://www.monotone.ca/). I use monotone for all my projects, and merge back and forth between branches all the time. -- -- Stephe