All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Jan Lübbe" <jluebbe@lasnet.de>
To: openembedded-devel@lists.openembedded.org
Subject: Re: please check BK&MTN to GIT conversion dry-run repository
Date: Wed, 15 Oct 2008 15:42:00 +0200	[thread overview]
Message-ID: <1224078120.3653.40.camel@localhost> (raw)
In-Reply-To: <1224062879.5189.49.camel@ted>

On Wed, 2008-10-15 at 10:27 +0100, Richard Purdie wrote:
> The original plan was to add the BKCVS later as a git tree graft rather
> than hardcoding it into the history now in a broken form. Is it too late
> to do this now?

It is not possible to change history in git without changing the commit
hashes. (so a "graft" is impossible without rebasing)

> The BKCVS conversion still has the problems I wanted to get resolved
> before we did this for example:
> 
> http://git.sicherheitsschwankung.de/?p=jan/oetest.git;a=commit;h=66944efa040bdf36062522c7c33413fc1e039d83
> 
> Where two commits have been rolled into one.

I tried to figure out how to solve this, but ran out of time. Adding the
(somewhat mangled) bk history now doesn't have any disadvantages and
still allows to find ot where the files come from. If someone figures
out how to do a better conversion, we can still rebase, it that is
desired.

-- 
Jan Lübbe <jluebbe@lasnet.de>            http://sicherheitsschwankung.de
 gpg-key      1024D/D8480F2E 2002-03-20
 fingerprint  1B25 F91F 9E7B 5D4F 1282  02D6 8A83 8BE4 D848 0F2E




  reply	other threads:[~2008-10-15 13:47 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-14 13:13 please check BK&MTN to GIT conversion dry-run repository Jan Luebbe
2008-10-14 13:17 ` Jan Luebbe
2008-10-14 14:23   ` Koen Kooi
2008-10-15  9:27   ` Richard Purdie
2008-10-15 13:42     ` Jan Lübbe [this message]
2008-10-15 15:20       ` Richard Purdie
2008-10-16  8:31         ` Jan Lübbe
2008-10-16  9:39           ` Richard Purdie
2008-10-17 15:10             ` Koen Kooi
2008-10-17 14:54           ` Michael 'Mickey' Lauer

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=1224078120.3653.40.camel@localhost \
    --to=jluebbe@lasnet.de \
    --cc=openembedded-devel@lists.openembedded.org \
    /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.