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

[PATCH 0/4] Support multiple ancestors in read-tree

From
Daniel Barkalow <barkalow@iabervon.org>
Date
Sep 5, 2005, 06:03 UTC
Message-ID
<Pine.LNX.4.63.0509050151240.23242@iabervon.org>

Various messages have already described this series. There's still a memory leak that should get resolved, but otherwise it should work. I'm not entirely sure that all directory-file conflict cases are handled properly, and some undefined cases behave differently. Also, I was a bit careless with preparing the patches.

	-Daniel
*This .sig left intentionally blank*
Next: Daniel Barkalow
Message 1 of 5 in “Support multiple ancestors in read-tree”
  1. 0/4 Support multiple ancestors in read-treeDaniel Barkalow, Sep 5, 2005
  2. 1/4 Add a function for getting a struct tree for an ent.Daniel Barkalow, Sep 5, 2005
  3. 2/4 Add function to append to an object_list.Daniel Barkalow, Sep 5, 2005
  4. 3/4 Rewrite read-treeDaniel Barkalow, Sep 5, 2005
  5. 4/4 Document the trivial merge rules for 3(+more ancestors)-way merges.Daniel Barkalow, Sep 5, 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.