On 01/23/2013 12:03 PM, John Keeping wrote: > On Wed, Jan 23, 2013 at 10:54:36AM +0100, Michael Haggerty wrote: >> On 01/20/2013 09:17 PM, Chris Rorvick wrote: >>> I have never used cvs2git, but I suspect Eric's efforts in making it a >>> potential backend for cvsimport are a better use of time. > > Is it possible to perform an incremental import with cvs2git? This > seems to be the one use case where the old cvsimport script (with cvsps > 2.x) still performs the best. > > I suppose that just re-running the full import will do the right thing > since the commits in Git should be identical, but would it be possible > to do better given the right information about a previous run? No, cvs2git does not support incremental imports. One user has reported that he *usually* gets identical commits for the overlapping history when he re-runs a full import, and last I heard he was using this as a kind of incremental import. We make an effort to make imports reproducible, at least when using a single version of cvs2git (for example, we process things in deterministic order rather than the order they happen come out of a file directory or Python hashmap). But the cycle-breaking heuristics in particular can give different results if history is added, not to mention the fact that CVS allows the user to make changes with retroactive and non-timestamped effects (e.g., adding or removing files from an existing branch/tag, changing a file's default branch from vendor to HEAD, changing the log messages of old revisions, obsoleting revisions). And if your repository is large, a full import can take a while. It would be possible to enhance cvs2git to handle incremental imports (well, at least if you rule out a few CVS commands that change deep history). But I don't believe anybody is working on this. Michael -- Michael Haggerty mhagger@xxxxxxxxxxxx http://softwareswirl.blogspot.com/ -- 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