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

Re: CFT: merge-recursive in C (updated)

From
Linus Torvalds <torvalds@osdl.org>
Date
Jun 27, 2006, 19:10 UTC
Message-ID
<Pine.LNX.4.64.0606271205130.3927@g5.osdl.org>
In-Reply-To
<Pine.LNX.4.63.0606272043400.29667@wbgn013.biozentrum.uni-wuerzburg.de>
On Tue, 27 Jun 2006, Johannes Schindelin wrote:
> 
> Note that all Alex does was to translate the Python code to C. And in 
> Python, this horrible graph thing was necessary, because git is not 
> libified yet.

Ahh. I thought the Python thing used an external program to do all graph calculations.

One thing to look out for is (as Junio mentioned) that you do often want to merge things with externally controlled "history": either by having something like cherry-pick/rebase give fake history information, or by manually forcing a certain merge-base (possibly even an empty tree) in order to generate a merge of two unrelated histories.

> HOWEVER, I think it is a very good start. It _works_, albeit slow, and we 
> have test cases in place to make sure that our wonderful optimizations do 
> not break the tool.

Yeah, once it's all in C, it's going to be easier to move functionality around incrementally.

		Linus
Previous: Johannes SchindelinNext: Alex Riesen
Message 31 of 32 in “CFT: merge-recursive in C (updated)”
  1. Alex RiesenJun 27, 2006
  2. Johannes SchindelinJun 27, 2006
  3. Alex RiesenJun 27, 2006
  4. Alex RiesenJun 28, 2006
  5. Johannes SchindelinJun 28, 2006
  6. Alex RiesenJun 28, 2006
  7. Johannes SchindelinJun 28, 2006
  8. Alex RiesenJun 28, 2006
  9. Johannes SchindelinJun 28, 2006
  10. Alex RiesenJun 29, 2006
  11. Junio C HamanoJun 29, 2006
  12. Alex RiesenJun 29, 2006
  13. Johannes SchindelinJun 29, 2006
  14. Alex RiesenJun 29, 2006
  15. Johannes SchindelinJun 29, 2006
  16. 1/2 refactor merge_bases() as preparation to libify merge-baseJohannes Schindelin, Jun 29, 2006
  17. move get_merge_bases() to core lib; use it in merge-recursiveJohannes Schindelin, Jun 29, 2006
  18. Johannes SchindelinJun 29, 2006
  19. Alex RiesenJun 29, 2006
  20. Johannes SchindelinJun 29, 2006
  21. Alex RiesenJun 29, 2006
  22. Alex RiesenJun 29, 2006
  23. Johannes SchindelinJun 29, 2006
  24. Linus TorvaldsJun 29, 2006
  25. Junio C HamanoJun 29, 2006
  26. Johannes SchindelinJun 29, 2006
  27. Junio C HamanoJun 29, 2006
  28. Alex RiesenJun 30, 2006
  29. Linus TorvaldsJun 27, 2006
  30. Johannes SchindelinJun 27, 2006
  31. Linus TorvaldsJun 27, 2006
  32. Alex RiesenJun 27, 2006

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.