From: Catalin Marinas Date: Thu, 09 Mar 2006 22:00:25 GMT Subject: Re: bug?: stgit creates (unneccessary?) conflicts when pulling Message-ID: In-Reply-To: <20060301155043.GA3706@spearce.org> On 01/03/06, Shawn Pearce wrote: > Speaking of making StGIT faster: earlier we were talking about how > git-diff|git-apply is faster than a 3 way git-read-tree on large > merges when there are many structural changes in the tree due to > the smaller number of process spawns required. > > You might want to take a look at pg--merge-all: This is sort of based > on git-merge-recursive, but I've gotten it down to just a handful > of process spawns, aside from the stupidity of git-checkout-index. Trying to implement this, I've just noticed that git-read-tree has a --aggressive option which takes care of the file removals. Adding this option lowered the pushing time in StGIT from ~2 min to under 2 seconds (merges between 2.6.14 and the latest kernel). There's probably no need to deal with file removals in pg--merge-all anymore. -- Catalin