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

Re: [BUG] fatal error during merge

From
SZEDER Gábor <szeder@ira.uka.de>
Date
Nov 13, 2008, 18:09 UTC
Message-ID
<20081113180931.GE29274@neumann>
In-Reply-To
<57814.N1gUGH5fRhE=.1226596012.squirrel@webmail.hotelhot.dk>
On Thu, Nov 13, 2008 at 06:06:52PM +0100, Anders Melchiorsen wrote:
Show 7 quoted lines
> SZEDER Gábor wrote:
> > It doesn't matter.  The test script errors out at the merge, and not
> > at the checkout.  Furthermore, it doesn't matter, whether HEAD~,
> > HEAD~, or HEAD^ is checked out, the results are the same.
> 
> Just to be sure, I tried reverting the commit that you bisected -- and my
> test case still fails.

Well, oddly enough, your second test case behaves somewhat differently than the first one, at least as far as bisect is concerned. Bisect nails down the second test case to 0d5e6c97 (Ignore merged status of the file-level merge, 2007-04-26; put Alex on Cc). Reverting this commit on master makes both of your test cases pass.

Gábor
Previous: Anders MelchiorsenNext: Anders Melchiorsen
Message 8 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.