On 02/10/05, Catalin Marinas <catalin.marinas@gmail.com> wrote: > An optimisation would be to keep the patches in diff format and apply > them but this would mean losing the advantages of the three-way > merging. After some tests, it looks like 'git-diff-tree -p ... | git-apply --index' is about 3 times faster than 'git-read-tree -m' (in the best case for git-read-tree with minor modifications of the base). It now takes ~0.5s to push a single patch (compared to ~1.5s). Since most of the patches, for routine updates of the base, don't generate conflicts, git-apply should work fine. I'll modify StGIT to use this method by default and fall back to the three-way merge in case it fails. This will also solve the problem with complex modifications of the base of the stack (i.e. file removals/additions) when there won't be any need to call the external index merger if git-apply succeeds. -- Catalin - 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 Mon Oct 03 23:57:29 2005
This archive was generated by hypermail 2.1.8 : 2005-10-03 23:57:32 EST