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. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Thu Aug 10 23:34:52 2006
This archive was generated by hypermail 2.1.8 : 2006-08-10 23:35:56 EST