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:16:54 -0400 Message-ID: <85li98h1qx.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 1364426247 26246 80.91.229.3 (27 Mar 2013 23:17:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 Mar 2013 23:17:27 +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:17:51 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 1UKzbH-0001FX-Vr for ged-emacs-devel@m.gmane.org; Thu, 28 Mar 2013 00:17:48 +0100 Original-Received: from localhost ([::1]:52263 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKzat-0006Mg-TS for ged-emacs-devel@m.gmane.org; Wed, 27 Mar 2013 19:17:23 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:38567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKzao-0006MN-Tz for emacs-devel@gnu.org; Wed, 27 Mar 2013 19:17:21 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKzan-0007GY-Fd for emacs-devel@gnu.org; Wed, 27 Mar 2013 19:17:18 -0400 Original-Received: from vms173003pub.verizon.net ([206.46.173.3]:58082) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKzan-0007GT-B0 for emacs-devel@gnu.org; Wed, 27 Mar 2013 19:17:17 -0400 Original-Received: from TAKVER ([unknown] [72.66.125.164]) by vms173003.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0MKC00ATVE06P360@vms173003.mailsrvcs.net> for emacs-devel@gnu.org; Wed, 27 Mar 2013 18:17:00 -0500 (CDT) 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 (windows-nt) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.46.173.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:158329 Archived-At: Stephen Leake writes: > 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. I suspect the key feature that makes it work is the conflict resolution tools in monotone; http://www.monotone.ca/docs/Merge-Conflicts.html#Merge-Conflicts I worked hard to make that flow nicely, and also to make the Emacs front end for it flow nicely (http://stephe-leake.org/emacs/ada-mode/dvc-intro.html) But there's not a lot of support for monotone, certainly no company is behind it, so it's probably not a good bet for a large long-term project. -- -- Stephe