From: Ryan Anderson <ryan@michonline.com>
Date: Thu, 17 Nov 2005 00:57:14 GMT
Subject: Re: [Question] info/grafts file.
Message-ID: <437BD56A.7030402@michonline.com>
In-Reply-To: <20051115000349.GA32136@hpsvcnb.fc.hp.com>

Carl Baldwin wrote:
> This is fine, I just needed to know.
> 
> How hard is it to, in a generic way, take a grafts file and reconstruct
> commits to include the parents in the graft file in the actual tree?  I
> am wondering because I couldn't, after much work, get git-svnimport to
> find my merges correctly.  So, I am needing to hand-graft some merges in
> to make things right.  Any suggestions?  I could try to figure something
> out if I can find some time.  I'm good with graph traversals and such.

It's actually pretty easy.  I wrote a rough (and not quite safe) tool to
do this a week or so ago.

http://marc.theaimsgroup.com/?l=git&m=113131673606637&w=2

I will try and clean it up a bit and submit it for inclusion in contrib/
sometime this coming weekend, but you should be able to use it to solve
this problem.

It's pretty straightforward, honestly.  (And I'm pretty sure it could be
faster if I did things slightly differently.)