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

Re: [RFC] ll-merge: Normalize files before merging

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Jun 11, 2010, 07:51 UTC
Message-ID
<4C11EB0D.20208@viscovery.net>
In-Reply-To
<4C11E717.4070508@gmail.com>
Am 6/11/2010 9:34, schrieb Eyvind Bernhardsen:
Show 9 quoted lines
> On 11. juni 2010 07:49, Johannes Sixt wrote:
>> I think you are going overboard here. Normalization should only happen
>> only for data that moves from the worktree to the database. But during a
>> merge, at most one part can come from the worktree, methinks; you are
>> normalizing all three of them, though.
> 
> Well, that's sort of the point.  All three are normalized to (hopefully)
> minimize the differences between them, increasing the chance of a
> successful merge.

I know what your point is. It is still inappropriate to call normalize_file() on data that comes from the repository. It is not the task of a merge procedure to blindly normalize data.

-- Hannes
Previous: Eyvind BernhardsenNext: Finn Arne Gangstad
Message 4 of 8 in “[RFC] ll-merge: Normalize files before merging”
  1. Eyvind BernhardsenJun 10, 2010
  2. Johannes SixtJun 11, 2010
  3. Eyvind BernhardsenJun 11, 2010
  4. Johannes SixtJun 11, 2010
  5. Finn Arne GangstadJun 11, 2010
  6. Eyvind BernhardsenJun 11, 2010
  7. Junio C HamanoJun 11, 2010
  8. Eyvind BernhardsenJun 11, 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.