From: Alex Riesen <raa.lkml@gmail.com>
Date: Fri, 14 Nov 2008 07:16:36 GMT
Subject: Re: [BUG] fatal error during merge
Message-ID: <20081114071636.GA4013@blimp.localdomain>
In-Reply-To: <7vfxlvf8up.fsf@gitster.siamese.dyndns.org>

Junio C Hamano, Fri, Nov 14, 2008 01:29:34 +0100:
> "Anders Melchiorsen" <mail@cup.kalibalik.dk> writes:
> 
> > Your patch got rid of the errors and it commits the merged tree. But the
> > working tree is not updated correctly, so the moved file disappears.
> 
> Isn't this a long known breakage of D/F conflict check logic in
> merge-recursive backend?

Could be, but there is no conflicting entries in the merged branches.
All file names are different and the D/F transition happens completely
on one branch.

And the patch isn't enough: the file Anders noticed missing is in the
index (correctly) but somehow removed from worktree.  Which is maybe
because it _still_ was a rename: 99% similarity. Well, just
"yes | tail -nNN" usually producess very similar data :)

Still broken, of course...