All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ryan Anderson <ryan@michonline.com>
To: Carl Baldwin <cnb@fc.hp.com>
Cc: Junio C Hamano <junkio@cox.net>, git@vger.kernel.org
Subject: Re: [Question] info/grafts file.
Date: Wed, 16 Nov 2005 19:57:14 -0500	[thread overview]
Message-ID: <437BD56A.7030402@michonline.com> (raw)
In-Reply-To: <20051115000349.GA32136@hpsvcnb.fc.hp.com>

[-- Attachment #1: Type: text/plain, Size: 946 bytes --]

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


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

  parent reply	other threads:[~2005-11-17  0:58 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 [this message]
2005-11-17 21:45       ` Yann Dirson

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=437BD56A.7030402@michonline.com \
    --to=ryan@michonline.com \
    --cc=cnb@fc.hp.com \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.