Re: [PATCH 22/48] merge-recursive: Fix sorting order and directory change assumptions

From: Johannes Sixt <j.sixt@viscovery.net>
Date: Jul 12, 2011, 07:27 UTC
Message-ID: <4E1BF77C.2020207@viscovery.net>
In-Reply-To: <4E1AA085.9010908@viscovery.net>

Am 7/11/2011 9:04, schrieb Johannes Sixt:

> A heads-up: This test case fails here on Windows. The messages produced are:

> As you can see, "Removing letters..." is missing on Windows, and the file
> 'letters' is indeed left in the working tree. Any quick ideas where to
> begin debugging this?

And the reason for this is that the qsort call in record_df_conflict_files assumes that qsort is a stable sort; but this is not guaranteed. In particular, the entry "letters" can be moved after "letters/file", which is not expected by the loop that follows the qsort.

-- Hannes

$ 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.