[furcas-discussion] Alternatives to git-cvsimport?

[Uhl, Axel]

Hi,

I'm having trouble with the continued import of CVS changes for the ocl-master branch. Some commits from CVS aren't properly imported into our git. I was able to re-import the entire MDT/OCL CVS repository into a new git which now contains the missing commits. However, for other reasons I seem to be unable to even cherry-pick the latest commits into our ocl-master branch.

Two requests:

 1) Maybe someone feels eligible to assist me in performing the cherry-pick so we at least get the latest changes into ocl-master once

 2) If someone knows a better alternative to git-cvsimport, please let me know.

Over time, Eclipse MDT/OCL will move to git. Probably it'll even be me doing this migration as the other committers are yet entirely unexperienced with git. So this problem will hopefully go away after Indigo, but we need a solution for the commits between now and Indigo.

Looking forward to suggestions and advice,
-- Axel