Re: Joining Repositories

From: Petr Baudis <pasky@suse.cz>
Date: Jan 18, 2006, 17:05 UTC
Message-ID: <20060118170536.GS28365@pasky.or.cz>
In-Reply-To: <Pine.LNX.4.64.0601180813170.3240@g5.osdl.org>

Dear diary, on Wed, Jan 18, 2006 at 05:23:03PM CET, I got a letter where Linus Torvalds <torvalds@osdl.org> said that...

Show 11 quoted lines

> On Wed, 18 Jan 2006, Ryan Anderson wrote:
> > merging with the old repositories should, at least theoretically, work, 
> > etc.
> 
> No. This - and the history rewriting - both have a fundamental problem: it 
> becomes totally impossible to merge back any changes of the subprojects, 
> at least automatically. The renaming just ends up making pretty much any 
> merge a manual affair (git can _help_, but it's going to be a matter of 
> luck if it works or not - and it usually won't work very well, because 
> you'll probably end up having files that have the same name in the new and 
> the old repo, and eventually you'll just have tons of confusion).

Well, the recursive merge strategy is at least advertised to be able to merge across renames (as long as they are autodetected). Not that I would have any practical experiences with it and I don't know how smart is it done (if it just runs rename detection between the merge base and current head, yes, that might not give very good results in this case).

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Of the 3 great composers Mozart tells us what it's like to be human,
Beethoven tells us what it's like to be Beethoven and Bach tells us
what it's like to be the universe.  -- Douglas Adams