[Kde-scm-interest] Meeting minutes

[Robert Wohlrab]

Oswald Buddenhagen wrote:
> On Thu, Nov 12, 2009 at 11:25:12PM +0100, Thomas Zander wrote:
> > On Thursday 12. November 2009 23.01.42 Oswald Buddenhagen wrote:
> > > > It is possible to move an independent git repo into another. Its
> > > > not trivial, not something you want to do everyday, but it is
> > > > possible.
> > >
> > > i said *clean*.
> >
> > Yes you did, why do you repeat it?
> 
> because the above proposal is in no way clean. the imported history is
> completely rebased on top of the target module. that way it is
> impossible to create an even remotely consistent checkout of a past
> state where the two modules were still separate.
Wrong. If you do it with a subtree merge it is not a rebase, it is merged into 
the big repo with complete history. It looks then like the history of the one 
is only the history of the subfolder and onwards it is the history of both of 
them.

-- 
Robert Wohlrab