From: Matthias Urlichs <smurf@smurf.noris.de>
Date: Wed, 20 Aug 2008 07:52:34 GMT
Subject: Re: git-cvsimport - losing changes in subsequent pulls of a CVS branch that I thought I wasn't modifying in the GIT repo.
Message-ID: <20080820075234.GF4047@smurf.noris.de>
In-Reply-To: <48ABCBFD.7070503@alum.mit.edu>

Hi,

Michael Haggerty:
> cvs2svn/cvs2git does not support this (called "incremental imports").

git-cvsimport tries to.

> It is quite hard to implement robustly.  In fact, I claim that no tool
> handles incremental imports robustly, despite the fact that some claim
> to do so :-)
> 
As people are habitually mucking with their CVS repositories, your best
way to reliably do an incremental import is to do a regular import,
put the two trees into the same git repository (easily achieved by a
line in .git/objects/info/alternates and strategic copying of the
tip-of-tree references), and git-rebase your non-CVS work.

-- 
Matthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de
Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de
 - -
When mutilating cattle, avoid the ones with testicles.
		-- The Evil Cultist List