Re: [Question] info/grafts file.

From: Yann Dirson <ydirson@altern.org>
Date: Nov 17, 2005, 21:45 UTC
Message-ID: <20051117214557.GA26122@nowhere.earth>
In-Reply-To: <437BD56A.7030402@michonline.com>

On Wed, Nov 16, 2005 at 07:57:14PM -0500, Ryan Anderson wrote:

Show 21 quoted lines

> 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.)

Hey, this exactly looks like the kind of script I intended to write in the following days ! I'll have a close look at it. Do you have a git repo from where I could pull the latest version ?

My goal is to write an "AcheoloGIT" toolkit, to be able to reconstruct an history incrementally, from patches, identifying in the way patches which build upon other patches. To make it more clear, there are in the embedded world a number of vendor shipping "jumbo patches", which include parts or all of official arch-specific trees, with more stuff added.

And well, since it is not an easy task, the process has to be incremental, grafting here and there between various parts of the tree to gradually refine my view of its history.

There is some preliminary work, but for now only focussed on making the import of series of patches more comforable. Grafting was supposed to be the next step :)

http://ydirson.free.fr/soft/git/argit.git/

Best regards,

-- 
Yann Dirson    <ydirson@altern.org> |
Debian-related: <dirson@debian.org> |   Support Debian GNU/Linux:
                                    |  Freedom, Power, Stability, Gratis
     http://ydirson.free.fr/        | Check <http://www.debian.org/>