>   We use three branches:

>     - CEDET trunk (in the following: 'cedet')
>     - Emacs trunk (in the following: 'emacs'). Of course, we do not
>       care for the full Emacs trunk, but only for the CEDET-related
>       files (essentially: lisp/cedet and lisp/emacs-lisp/eieio*).
>     - a special branch inside of CEDET upstream (in the following: 'merge')

Sounds OK.  Note that I do not have a strong opinion on how things are
done as long as the two are kept in sync reliably (ideally
automatically, but most importantly without relying critically on
a single person).


        Stefan