Junio C Hamano <gitster@xxxxxxxxx>: > > Should I resubmit, or do you intend to fix these while merging? > > I'd appreciate a re-roll, perhaps in a few days after the dust > settles. You'll get it. It will take a little longer than it otherwise might have because I'm in the middle of straightening out the mess around cvsps and git-cvsimport, which is deeper and nastier than I realized. It turns out that one of the options git-cvsimport depends on, -A, has been broken (leading to incorrect conversions of branchy repos) since 2006 if not earlier; I'm removing it outright. Thus, the version of git-cvsimport in the git-tree will die with an error calling cvsps 3.x - but since what it was doing before was actually mangling users' repositories this is no great loss. I'm going to have to shoot the existing implementation of git-cvsimport through the head and rewrite it. This won't be difficult; I already have a proof-of-concept in 126 lines of Python, which is a big improvement over the 1179 lines of Perl in the existing version. Most of the vanished bulk is CVS client code for fetching logs and files, which is now done better and faster inside cvsps. -- <a href="http://www.catb.org/~esr/";>Eric S. Raymond</a> -- 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