Re: State of the CEDET merge

[David Kastrup <dak@gnu.org>]

Lluís <xscript@gmx.net> writes:

> Yup, such a branch exists and is partially ported. But lots of changes
> have been inserted in both sides (Emacs and Cedet), which forced me to
> do a manual merge reviewing code line-by-line, instead of just renaming
> files.
>
> My current approach is (it's the best I could find that provided some
> semi-automatic merging):
>
>    - look for the date (D) where a file was added into the emacs
>      repository
>    - build a patch (P) of the changes in Emacs since date D to present
>      day
>    - apply patch P into the Cedet repository (file-rename branch)
>
> So the currently done work is:
>
>    - rename most (all?) the grammar files in cedet
>    - fix these to build with their new naming scheme
>    - finished merging eieio
>    - finished merging speedbar
>    - added a list of which files are not present on both repositories
>    - started merging common cedet code
>
> This is an extremely time consuming process (specially because I'm not
> much knowledgeable of the cedet codebase, nor an elisp ninja), and I've
> not been able to devote much to it since long ago.

Sounds like having to track two separately moving targets.  Any idea how
to make the respective developers aware of the problem and move in a
more synchronized fashion, so as to decrease the speed with which the
task you have focused on grows?

-- 
David Kastrup