git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yann Dirson <ydirson@altern.org>
To: Ryan Anderson <ryan@michonline.com>
Cc: Carl Baldwin <cnb@fc.hp.com>, Junio C Hamano <junkio@cox.net>,
	git@vger.kernel.org
Subject: Re: [Question] info/grafts file.
Date: Thu, 17 Nov 2005 22:45:57 +0100	[thread overview]
Message-ID: <20051117214557.GA26122@nowhere.earth> (raw)
In-Reply-To: <437BD56A.7030402@michonline.com>

On Wed, Nov 16, 2005 at 07:57:14PM -0500, Ryan Anderson wrote:
> 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/>

      reply	other threads:[~2005-11-17 21:44 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-11-14 18:20 [Question] info/grafts file Carl Baldwin
2005-11-14 19:59 ` Petr Baudis
2005-11-14 20:56 ` Junio C Hamano
2005-11-15  0:03   ` Carl Baldwin
2005-11-15  8:31     ` Alan Chandler
2005-11-15 17:16       ` Linus Torvalds
2005-11-17  0:57     ` Ryan Anderson
2005-11-17 21:45       ` Yann Dirson [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20051117214557.GA26122@nowhere.earth \
    --to=ydirson@altern.org \
    --cc=cnb@fc.hp.com \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    --cc=ryan@michonline.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).