[oe] please check BK&MTN to GIT conversion dry-run repository

[Jan Lübbe]

On Wed, 2008-10-15 at 16:20 +0100, Richard Purdie wrote:
> 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.

Oh, this is new to me :/ When i talked about importing BK history with
Holger he didn't seem to have any doubts.

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

>From what i just read about grafts, it will replace the parent
information for the specified commit. So we could still replace the
current BK import with the correct one.

Grafts are local only though.

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

We could import BK again (correctly) into a separate branch and then
document how to graft it to instead of the current stuff.

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