From: Junio C Hamano <junkio@cox.net>
Date: Wed, 18 Jan 2006 17:33:21 GMT
Subject: Re: Joining Repositories
Message-ID: <7v7j8xxwym.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20060118170536.GS28365@pasky.or.cz>

Petr Baudis <pasky@suse.cz> writes:

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

If I understand and remember the code correctly, it is based on
rename detection between two heads.  When the versions have
diverged greatly beyond recognition, obviously this would not
work well.