git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [BUG] fatal error during merge

From
Alex Riesen <raa.lkml@gmail.com>
Date
Nov 14, 2008, 07:16 UTC
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:
Show 7 quoted lines
> "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...
Previous: Junio C HamanoNext: Anders Melchiorsen
Message 13 of 14 in “[BUG] fatal error during merge”
  1. Anders MelchiorsenNov 13, 2008
  2. Samuel TardieuNov 13, 2008
  3. SZEDER GáborNov 13, 2008
  4. Anders MelchiorsenNov 13, 2008
  5. Samuel TardieuNov 13, 2008
  6. SZEDER GáborNov 13, 2008
  7. Anders MelchiorsenNov 13, 2008
  8. SZEDER GáborNov 13, 2008
  9. Anders MelchiorsenNov 13, 2008
  10. Alex RiesenNov 13, 2008
  11. Anders MelchiorsenNov 13, 2008
  12. Junio C HamanoNov 14, 2008
  13. Alex RiesenNov 14, 2008
  14. Anders MelchiorsenNov 14, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.