From: Steffen Prohaska <prohaska@zib.de>
Date: Thu, 03 Apr 2008 05:47:54 GMT
Subject: Re: [PATCH] cvsps/cvsimport: fix branch point calculation and broken branch imports
Message-ID: <0C7AA499-56AD-4D20-AED0-9E7DDD0C77DF@zib.de>
In-Reply-To: <1207100091.10532.64.camel@gandalf.cobite.com>


On Apr 2, 2008, at 3:34 AM, David Mansfield wrote:

> P.S Also, as many people may have imported broken branches already,  
> can
> anyone thing of a way to fix the branch, (maybe with git-rebase or
> something)?  The breakage affects, I believe, files not ever  
> modified on
> the branch until any given point in time on the branch...
>

The breakage you describe might be the same breakage that I recognized
in June 2007:

   http://article.gmane.org/gmane.comp.version-control.git/50736

At that time, I wrote a script (git-transplant) that fixed a broken
import from CVS for me:

   http://article.gmane.org/gmane.comp.version-control.git/50746

The discussion in

   http://article.gmane.org/gmane.comp.version-control.git/50789

explains the reason for the script a bit more detailed.

But note that I never finished git-transplant and I also failed to
convince anyone that the idea behind the script is of any general value.
Instead, I decided that git-cvsimport is not the right tools for me; and
since then I use parsecvs to convert my repositories.

         Steffen