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

Re: Importing Mozilla CVS into git

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jun 2, 2006, 07:46 UTC
Message-ID
<Pine.LNX.4.63.0606020941210.2482@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<20060602044404.GB5429@spearce.org>
Hi,
On Fri, 2 Jun 2006, Shawn Pearce wrote:
Show 17 quoted lines
> Pavel Roskin <proski@gnu.org> wrote:
> > On Fri, 2006-06-02 at 00:11 -0400, Shawn Pearce wrote:
> > 
> > > GIT today requires not only a decent UNIX shell but also, GNU tools,
> > > Perl and Python.  Porting to Solaris has recently had some more
> > > effort put into it to remove some of the GNU tool dependencies but
> > > perhaps one of the most important features (git-merge-recursive)
> > > is a Python script.
> > 
> > The great thing about git is that it's modular.  A single utility can be
> > replaced and retested in the same environment, without having to rewrite
> > the rest of the scripts.  A dedicated programmer with good C and Python
> > skills could rewrite git-merge-recursive.py in C in 2 days, I believe.
> > Add a few days of bug fixing, of course.
> 
> Heh.  Funny you should mention that.  I was just thinking a few
> minutes ago about working on that exact change...

I thought about this a couple of weeks ago. I recalled to have read something about the principle: if there is more than one merge-base candidate, it starts by merging the merge-base candidates until there is only one 'virtual' merge-base candidate.

However, looking at the code I fainted. Sure, a lot should be way easier in C, because the functions are already there, _but_ it seemed too much work for one afternoon nevertheless (and I did not have more time to spare).

Ciao, Dscho

Previous: Shawn PearceNext: Jon Smirl
Message 14 of 47 in “Importing Mozilla CVS into git”
  1. Jon SmirlJun 1, 2006
  2. Keith PackardJun 1, 2006
  3. Jon SmirlJun 2, 2006
  4. Keith PackardJun 2, 2006
  5. Jon SmirlJun 2, 2006
  6. Shawn PearceJun 2, 2006
  7. Keith PackardJun 2, 2006
  8. Jon SmirlJun 2, 2006
  9. Keith PackardJun 2, 2006
  10. Jon SmirlJun 2, 2006
  11. Shawn PearceJun 2, 2006
  12. Pavel RoskinJun 2, 2006
  13. Shawn PearceJun 2, 2006
  14. Johannes SchindelinJun 2, 2006
  15. Jon SmirlJun 2, 2006
  16. Igor BukanovJun 7, 2006
  17. Pavel RoskinJun 7, 2006
  18. Jon SmirlJun 7, 2006
  19. Jakub NarebskiJun 7, 2006
  20. Linus TorvaldsJun 7, 2006
  21. Martin LanghoffJun 7, 2006
  22. Martin LanghoffJun 2, 2006
  23. Robin Rosenberg (list subscriber)Jun 3, 2006
  24. Linus TorvaldsJun 3, 2006
  25. Bertrand JacquinJun 4, 2006
  26. Jakub NarebskiJun 4, 2006
  27. Linus TorvaldsJun 4, 2006
  28. Robin Rosenberg (list subscriber)Jun 4, 2006
  29. Linus TorvaldsJun 4, 2006
  30. Robin Rosenberg (list subscriber)Jun 4, 2006
  31. Robin Rosenberg (list subscriber)Jun 4, 2006
  32. Linus TorvaldsJun 4, 2006
  33. Yakov LernerJun 5, 2006
  34. Jon SmirlJun 3, 2006
  35. Jon SmirlJun 3, 2006
  36. Martin LanghoffJun 6, 2006
  37. Jon SmirlJun 6, 2006
  38. Martin LanghoffJun 6, 2006
  39. Keith PackardJun 7, 2006
  40. Jon SmirlJun 7, 2006
  41. Linus TorvaldsJun 1, 2006
  42. Jon SmirlJun 2, 2006
  43. Linus TorvaldsJun 2, 2006
  44. Junio C HamanoJun 2, 2006
  45. Linus TorvaldsJun 2, 2006
  46. Junio C HamanoJun 2, 2006
  47. Martin LanghoffJun 2, 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.