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

Re: What's in git.git, and announcing GIT 1.4.2-rc4

From
Alex Riesen <raa.lkml@gmail.com>
Date
Aug 10, 2006, 13:34 UTC
Message-ID
<81b0412b0608100634j4f82d486nd8ba6dd3ac85b0e7@mail.gmail.com>
In-Reply-To
<7vy7txxts5.fsf@assigned-by-dhcp.cox.net>
On 8/10/06, Junio C Hamano <junkio@cox.net> wrote:
>   - A new merge strategy, merge-recur, which is a rewrite of
>     merge-recursive in C, by Johannes and Alex.

It still has problems devouring that monster merge I have (~20k entries, with around 40 changed in the other branch, around 100 revs ago. Big binary files involved. Renames and copies). Perfomance is nowhere near usable: ~20min on Windows/3GHz/2Gb, ~4Min on Linux/1.4GHz/384Mb ;) I agree that Linux is much more bearable but 4Min is still too much (especially comparing to that "stupid" resolve).

I noticed that it spends a lot of time finding renames (diffcore_std, in particular). Why doesn't it take that much time for "diff-tree -M -r base head1" + "diff-tree -M -r base head2", I wonder...? (~30 sek, for that windows box).

Sorry, I can't provide the tree. I suppose Mozilla tree can be compared to that thing, when it becomes available. Linux kernel is no good for reproducing this problem: it's too clean and compact.

Previous: Johannes SchindelinNext: Johannes Schindelin
Message 12 of 14 in “What's in git.git, and announcing GIT 1.4.2-rc4”
  1. Junio C HamanoAug 10, 2006
  2. Willy TarreauAug 10, 2006
  3. Junio C HamanoAug 10, 2006
  4. Junio C HamanoAug 10, 2006
  5. Willy TarreauAug 10, 2006
  6. Johannes SchindelinAug 10, 2006
  7. Junio C HamanoAug 10, 2006
  8. Johannes SchindelinAug 10, 2006
  9. Junio C HamanoAug 10, 2006
  10. Junio C HamanoAug 10, 2006
  11. Johannes SchindelinAug 10, 2006
  12. Alex RiesenAug 10, 2006
  13. Johannes SchindelinAug 10, 2006
  14. Alex RiesenAug 10, 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.