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

Re: [PATCH] merge-recursive: demonstrate an incorrect conflict with submodule

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Jun 8, 2010, 11:58 UTC
Message-ID
<4C0E3065.5070401@viscovery.net>
In-Reply-To
<4C0E2AB4.2010008@viscovery.net>
Am 6/8/2010 13:34, schrieb Johannes Sixt:
Show 7 quoted lines
> +test_expect_failure 'merge-recursive simple w/submodule result' '
> +
> +	git ls-files -s >actual &&
> +	(
> +		echo "100644 $o5 0	a"
> +		echo "100644 $o0 0	c"
> +		echo "100644 $c1 0	d"
Make this line
		echo "160000 $c1 0	d"
Sorry!
> +	) >expected &&
> +	test_cmp expected actual
-- Hannes
Previous: Johannes Sixt
Message 4 of 4 in “Merging a commit from a distant branch, cherry-pick seems to fail”
  1. Sjors GielenJun 7, 2010
  2. Johannes SixtJun 8, 2010
  3. merge-recursive: demonstrate an incorrect conflict with submoduleJohannes Sixt, Jun 8, 2010
  4. Johannes SixtJun 8, 2010

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.