Re: RFC: Moving CEDET development to Emacs

David Engster <[email protected]> writes:
>   - We will loose a lot of commit history (it will be only available in
>     the old repo).

(Disclaimer : I'm not a cedet user.)

IIUC they are both git branches, so you can, in an emacs git repo (i)
add cedet as a remote, (ii) "git remote update" to fetch the main CEDET
branch, let's say it is cedet/master, (iii) "git merge --no-commit
cedet/master" to prepare for committing a merge commit (iv) do whatever
is needed to put the worktree in its final shape (this is where you
actually merge the files of the two projects), then (v) "git commit -m
'Merge CEDET'".

The result will be a commit with two parents : one is the usual emacs
branch, the other is the cedet branch (which bears only the cedet files)
and the two have no common ancestor, but they are merged at that point.

However this is only a way of keeping the history, it's by no means
practical wrt e.g. bisecting (because testing
"cedet-as-merged-with-emacs" is almost certainly very different from
testing "cedet-standalone"). It will also mean many emails on the
emacs.diff mailing list (which gets one mail per added commit).

-- 
Nicolas Richard


------------------------------------------------------------------------------