From: Richard Purdie <rpurdie@rpsys.net>
To: openembedded-devel@openembedded.org
Subject: Re: please check BK&MTN to GIT conversion dry-run repository
Date: Wed, 15 Oct 2008 16:20:46 +0100 [thread overview]
Message-ID: <1224084046.5189.75.camel@ted> (raw)
In-Reply-To: <1224078120.3653.40.camel@localhost>
On Wed, 2008-10-15 at 15:42 +0200, Jan Lübbe wrote:
> 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)
It is possible, you just do something like:
echo "$commit-id $graft-id" >> .git/info/grafts
which then adds some history to the start of the tree. Look up git tree
grafts and you'll find further information about this feature.
> > 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
It does since we can't now add a correct version at a later date using a
tree graft.
> 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.
No, we don't want to ever rebase. I'd much prefer we had a graft for
that point in time so we can just replace the history as and when we
come up with a better version.
Cheers,
Richard
next prev parent reply other threads:[~2008-10-15 15:26 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
2008-10-15 15:20 ` Richard Purdie [this message]
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=1224084046.5189.75.camel@ted \
--to=rpurdie@rpsys.net \
--cc=openembedded-devel@lists.openembedded.org \
--cc=openembedded-devel@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox