Re: [ANNOUNCE] Git wiki

From: Petr Baudis <pasky@suse.cz>
Date: May 5, 2006, 16:40 UTC
Message-ID: <20060505164045.GA27689@pasky.or.cz>
In-Reply-To: <7vejz8241m.fsf@assigned-by-dhcp.cox.net>

Dear diary, on Fri, May 05, 2006 at 11:51:01AM CEST, I got a letter where Junio C Hamano <junkio@cox.net> said that...

Show 11 quoted lines

> Petr Baudis <pasky@suse.cz> writes:
> 
> > But the non-obviously important part here to note is that the branch B
> > merely "corrects a typo on a comment somewhere" - the latest versions in
> > branch A and branch B are always compared for renames, therefore if
> > branch A renamed the file and branch B sums up to some larger-scale
> > changes in the file, it still won't be merged properly.
> 
> I probably am guilty of starting this misinformation, but the
> code does not compare the latest in A and B for rename
> detection; it compares (O, A) and (O, B).

Where O = LCA(A,B) (modulo recursiveness)? Yes, that is what I meant to say but I phrased it wrong, sorry.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Right now I am having amnesia and deja-vu at the same time.  I think
I have forgotten this before.