Re: RFC: Moving CEDET development to Emacs

David Engster <[email protected]> writes:
> Nicolas Richard writes:
>> IIUC they are both git branches,
>
> Unfortunately, no. They are completely separate repositories.

But, they are git repos, right ? In this case they are git branches. The
fact that they are not in the same repo right now is not a problem as
examplified below :

cd $(mktemp -d)
# create a test repository.
mkdir repo1
cd repo1
git init
touch foo
git add foo
git commit -m "Foo"
cd ..
# create another test repository.
mkdir repo2
cd repo2
git init
touch bar
git add bar
git commit -m "Bar"
# at this point we have two separate repos. We're going to merge them:
git remote add repo1 ../repo1
git remote update
# now we have the master branch of repo1 in repo2 and can merge them :
git merge --no-commit repo1/master
# here merging succeeds because there is no conflict
# in the emacs+cedet case it might fail or succeed, but it will
# certainly not be correct so now is time to put the worktree in its
# final shape.
# then register the merge:
git commit -m "merge"
# check what happened :
git log --graph --decorate --pretty=oneline --abbrev-commit --all

HTH,

Nico.

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