From: Alex Riesen <raa.lkml@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Anders Melchiorsen" <mail@cup.kalibalik.dk>,
"SZEDER Gábor" <szeder@ira.uka.de>,
"Samuel Tardieu" <sam@rfc1149.net>,
git@vger.kernel.org,
"Johannes Schindelin" <johannes.schindelin@gmx.de>
Subject: Re: [BUG] fatal error during merge
Date: Fri, 14 Nov 2008 08:16:36 +0100 [thread overview]
Message-ID: <20081114071636.GA4013@blimp.localdomain> (raw)
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...
next prev parent reply other threads:[~2008-11-14 7:17 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-13 9:22 [BUG] fatal error during merge Anders Melchiorsen
2008-11-13 13:23 ` Samuel Tardieu
2008-11-13 14:03 ` SZEDER Gábor
2008-11-13 14:25 ` Anders Melchiorsen
2008-11-13 14:26 ` Samuel Tardieu
2008-11-13 14:53 ` SZEDER Gábor
2008-11-13 17:06 ` Anders Melchiorsen
2008-11-13 18:09 ` SZEDER Gábor
2008-11-13 22:25 ` Anders Melchiorsen
2008-11-13 23:09 ` Alex Riesen
2008-11-13 23:34 ` Anders Melchiorsen
2008-11-14 0:29 ` Junio C Hamano
2008-11-14 7:16 ` Alex Riesen [this message]
2008-11-14 9:16 ` Anders Melchiorsen
-- strict thread matches above, loose matches on Subject: below --
2009-05-10 16:33 Alex Riesen
2009-05-10 23:10 ` Johannes Schindelin
2009-05-11 7:39 ` Alex Riesen
2009-05-11 7:37 ` Anders Melchiorsen
2009-05-11 8:34 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081114071636.GA4013@blimp.localdomain \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=mail@cup.kalibalik.dk \
--cc=sam@rfc1149.net \
--cc=szeder@ira.uka.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).