Re: [PATCH] merge-recursive: Only print relevant rename messages

From: Junio C Hamano <junkio@cox.net>
Date: Nov 7, 2005, 23:54 UTC
Message-ID: <7v64r4qai6.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20051107231944.GA11327@c165.ib.student.liu.se>

Fredrik Kuivinen <freku045@student.liu.se> writes:

Show 6 quoted lines

> @@ -178,7 +181,7 @@ def mergeFile(oPath, oSha, oMode, aPath,
>              sha = bSha
>      else:
>          if aSha != oSha and bSha != oSha:
> -            merge = True
> +            merge = MERGE_TRIVIAL

The rest looks good to me, but are you sure about this part? I have a feeling that the above "and" should be "or", meaning, we check to see if there is _any_ change, and default to TRIVIAL, but later we would find that we need a real merge and then promote it to MERGE_3WAY.

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