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

Re: rebase hint unmerged file removed

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Aug 25, 2009, 07:35 UTC
Message-ID
<4A939455.5030908@viscovery.net>
In-Reply-To
<4A92A6E6.5060702@viscovery.net>
Johannes Sixt schrieb:
> Rebase -i emitted used to write merge-recursive's conflict hints that said
> "modify/delete", "modify/rename", "content", etc. I think that's what you
> were looking for. But these hints have vanished since quite some time now.
> I haven't taken the time, yet, to track down when this happened and why.

Ok, I bisected it to 6eb1b437 (cherry-pick/revert: make direct internal call to merge_tree(), 2008-09-02), which is part of a series around merge-recursive: 1ad6d46..ed520a8

The commit message says: "One regression is that the status message is lost as there is no way to flush them from outside the refactored library code yet." But is it intentional that these messages were never recovered?

BTW, I miss the messages a lot, too, but I'm unfamiliar with the code in question to try to do something about it.

-- Hannes
Previous: Johannes SixtNext: Miklos Vajna
Message 5 of 6 in “rebase hint unmerged file removed”
  1. bill lamAug 24, 2009
  2. Jeff KingAug 24, 2009
  3. bill lamAug 25, 2009
  4. Johannes SixtAug 24, 2009
  5. Johannes SixtAug 25, 2009
  6. Miklos VajnaAug 25, 2009

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.