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

Re: [RFC] Looking at multiple ancestors in merge

From
Daniel Barkalow <barkalow@iabervon.org>
Date
Aug 26, 2005, 05:16 UTC
Message-ID
<Pine.LNX.4.63.0508260108290.23242@iabervon.org>
In-Reply-To
<Pine.LNX.4.63.0508242249030.23242@iabervon.org>
On Wed, 24 Aug 2005, Daniel Barkalow wrote:
> Of course, this is going to take a bit of work, because read-tree
> currently puts all of its arguments into the cache and then works on
> merging, and taking multiple ancestors requires putting them somewhere
> else, because they won't fit in the cache.

I've started this, and have gotten as far as having read-tree accept > 3 trees and ignore everything but the last 3. Am I correct in assuming that if I break read-tree in any way, some test will fail?

	-Daniel
*This .sig left intentionally blank*
Previous: Matthias UrlichsNext: Junio C Hamano
Message 5 of 7 in “[RFC] Looking at multiple ancestors in merge”
  1. Daniel BarkalowAug 25, 2005
  2. A Large Angry SCMAug 25, 2005
  3. Daniel BarkalowAug 25, 2005
  4. Matthias UrlichsAug 25, 2005
  5. Daniel BarkalowAug 26, 2005
  6. Junio C HamanoAug 26, 2005
  7. Daniel BarkalowAug 26, 2005

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.