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

[David Engster]

Stefan Monnier writes:
>>        /--to-emacs  <-|   --------------------->
>>       /        ^      |         diff|patch
>>      |         |      |
>>      |         |      |
>> CEDET ----trunk|    <-|                         Emacs trunk
>>      |                |
>>      |                |
>>       \               |         diff|patch
>>        \--from-emacs -|   <--------------------
> [...]
>> Emacs->CEDET: Now that's tedious. You have to first generate a list of
>> commits in Emacs trunk which changed files from CEDET.
>
> Hmm... Why don't you have a more symmetric setup.  I.e. have
> a "to-cedet" branch on the Emacs side, where the non-CEDET files are
> removed and the CEDET files are renamed appropriately?

I have thought of doing a similar setup on the Emacs side. The main
problem is that I'd have a huge list of conflicts every time I merge
from trunk (for every file that was changed which is not in
'to-cedet'). I could probably script things to resolve those
automatically, though.  Still, getting the list of commits which change
CEDET files is not difficult, aside from taking several minutes to
complete (basically bzr log lisp/cedet lisp/emacs-lisp/eieio* ...).

The real work is getting the patches to apply upstream, resolve
conflicts and not loose track of what you've already merged (although I
guess I should just merge more often...).

-David