Re: On the subject of Git, Bazaar, and the future of Emacs development

[Stephen Leake]

Stephen Leake <address@hidden> writes:

> Stefan Monnier <address@hidden> 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