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

Re: [PATCH] merge-tree: fix "same file added in subdir"

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 7, 2013, 20:12 UTC
Message-ID
<7vk3oe2j85.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20130328093458.GV2286@serenity.lan>
John Keeping <john@keeping.me.uk> writes:
Show 12 quoted lines
> Having re-read the manpage, I think you're right that we should just
> resolve the "both added identically" case cleanly, but I wonder whether
> some of the other cases should also be resolved cleanly.
>
> git-merge-tree(1) says:
>
>     the output from the command omits entries that match the <branch1>
>     tree.
>
> so you could argue that "added in branch1", "changed in branch1,
> unmodified in branch2" and "removed in branch1, unchanged in branch2"
> should also print no output.

Yes, that description explains what we wanted to achieve with merge-tree that is still an unfinished experiment and fixing these cases you identified above to match the stated goal is a good thing to do. I've been meaning to find enough time to do a new merge strategy backend based on the logic of this program, and the few patches I sent out on it recently were fallout from preparatory steps for it.

Previous: John KeepingNext: John Keeping
Message 5 of 8 in “merge-tree: fix "same file added in subdir"”
  1. merge-tree: fix "same file added in subdir"John Keeping, Mar 27, 2013
  2. Junio C HamanoMar 27, 2013
  3. John KeepingMar 27, 2013
  4. John KeepingMar 28, 2013
  5. Junio C HamanoApr 7, 2013
  6. merge-tree: don't print entries that match "local"John Keeping, Apr 7, 2013
  7. René ScharfeApr 27, 2013
  8. John KeepingApr 27, 2013

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.