Re: cvs2svn conversion directly to git ready for experimentation

From: Steffen Prohaska <prohaska@zib.de>
Date: Aug 3, 2007, 07:10 UTC
Message-ID: <B4109CF3-A849-40C2-BDFD-DD7CA5231FA8@zib.de>
In-Reply-To: <46a038f90708021608o21480074ybcfada767afc7b04@mail.gmail.com>

On Aug 3, 2007, at 1:08 AM, Martin Langhoff wrote:

> Is there any way we can run tweak cvs2svn to run incrementals, even if
> not as fast as cvsps/git-cvsimport? The "do it remotely" part can be
> worked around in most cases.

What I currently do with parsecvs is to run complete imports again on the repo. For 'normal' changes to cvs the old import can be fast forwarded to the new import. However, if you add or remove files or tweak revision in another abnormal way (cvs admin) this might fail.

In this case I manually search the last common commit and rebase new commits to the old, already imported branch. I need to do this if I already publishes the imported branch. Otherwise I can as well just reset to the newly imported branch and rebase my work on top of it. Some careful validation (git diff-*) is included in my workflow.

A complete run of parsecvs is fine for me because it is so fast. I run git-filter-branch afterwards anyway to cleanup some commit messages and author information. This takes most of the time, because it spawns off tons of sub processes.

I'd not recommend my approach for incremental imports every hour, but you can run it every day (although I do less often). You only need to validate the final result (fast forward or not). The rest can be fully automated by some shell scripting.

	Steffen