Hi Thomas, Thomas Schwinge <tschwi...@gnu.org> writes:
> On Fri, Jan 16, 2009 at 07:20:01PM +0100, Ludovic Courtès wrote: >> We converted Guile's CVS repo (where there were a number of branches, >> several of which were active) to Git several months ago. The first >> attempt used `git-cvsimport' and was a failure, because this tool >> doesn't correctly handle branches (basically, HEAD was correct, but the >> branches were broken). We ended up using `cvs2svn', which turned out to >> be the right solution. Details and pointers in this thread: >> >> http://thread.gmane.org/gmane.lisp.guile.devel/7124 > > And I'm seeing the same (I think) problems: converting gnumach with > git-cvsimport will yield an unusable gnumach-1-branch -- on which you > would still find all the oskit files that are not present in the CVS > branch. Guillem suggested using cvs2svn and then git svn clone, Just to be clear: `cvs2svn' comes with a tool called `cvs2git' (http://cvs2svn.tigris.org/cvs2git.html), is it what you used? That's what I used for Guile and didn't notice any problems. > but that > has problems of its own: it at least misconverts the release tags that > the gnumach repository has: suddenly files pop up (and are removed again) > that had been removed already before. I'll do some further > experimenting, but if someone wants to chime in, please speak up. The only thing "special" about `cvs2git' that I noticed is that CVS tags are translated into Git commits that don't introduce any change, such as http://git.savannah.gnu.org/gitweb/?p=guile.git;a=commit;h=63291d9c3ff2422155196f4263d5b0ea8c5fd973 . Are you seeing something different? People on the `cvs2svn' mailing list were responsive and helpful, so you might want to try there as well. Thanks, Ludo'.