On Wed, Sep 23, 2009 at 07:35:24PM +0200, Reto Glauser wrote: > - Is the problem in cvsps or git-cvsimport or in the CVS history? It is very likely a problem of cvsps. I have collected a couple of tests illustrating the current limitations: http://repo.or.cz/w/cvsps-hv.git Interested in fixing some of them ? > - Can I use the cvs2git import as a starting point and later use > git-cvsimport for incrementally update the git repository? Unfortunately there is no robust incremental tool for cvs at the moment. As soon as you get your colleagues to use git the pain just dissapears ;) > - Can I somehow compare the result of git-cvsimport and cvs2git to see > differences? How about a plain diff between the directory structures. > - Is there any other feasible workflow to stay in sync with a CVS > repository with a large history while still using git behind the scene? During the transition phase I used to track the old system with a seperate branch. Everytime you get an update from CVS you simply commit it to that branch. Its important that you do not mix this branch with your development. You do not do any work on it just commit the clean revision like you get them from the server. I then used feature branches for the work which I rebased regularly. Once you want to merge a branch comes the hard part: A: * Update the tracking branch from CVS * Merge the first/next commit from the branch in git * Commit to cvs and copy the commit message * Goto A: Maybe for cvs you can script this. You can also merge the whole branch at once if you are lazy but then the diffs will not be nice when you later completely migrate to git. cheers Heiko -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html