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

Re: [PATCH] builtin-rerere: fix conflict markers parsing

From
OMOlivier Marin <dkr+ml.git@free.fr>
Date
Jul 7, 2008, 13:55 UTC
Message-ID
<48722038.1010203@free.fr>
In-Reply-To
<alpine.DEB.1.00.0807071400180.18205@racer>
Johannes Schindelin a écrit :
Show 14 quoted lines
> 
> So what about
> 
> 	<<<<<<< This hunk contains =====
> 	anythin
> 	=======
> 
> 	Hello
> 	=======
> 	somethin else
> 	>>>>>>> problem!
> 
> 
> If you fix it, I think you should do it properly, and analyze the index.

If I read the code correctly, this case is not a problem at all because what is important is the content between <<< and >>> : even if you match the wrong === marker, you will match the first one only, then parsing will success and preimage file will be OK. Also because we always match in the same order the sha1 will be the same.

Anyway, I do not know how to match the right === marker.
Olivier.
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 3 of 9 in “builtin-rerere: fix conflict markers parsing”
  1. builtin-rerere: fix conflict markers parsingOlivier Marin, Jul 7, 2008
  2. Johannes SchindelinJul 7, 2008
  3. Olivier MarinJul 7, 2008
  4. Johannes SchindelinJul 7, 2008
  5. Olivier MarinJul 7, 2008
  6. Johannes SchindelinJul 7, 2008
  7. Junio C HamanoJul 7, 2008
  8. Re* [PATCH] builtin-rerere: fix conflict markers parsingJunio C Hamano, Jul 8, 2008
  9. Olivier MarinJul 8, 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.