From: Catalin Marinas Date: Wed, 01 Mar 2006 15:08:39 GMT Subject: Re: bug?: stgit creates (unneccessary?) conflicts when pulling Message-ID: In-Reply-To: <20060301145105.GB3313@spearce.org> On 01/03/06, Shawn Pearce wrote: > [Side Note: I've suddenly stopped receiving mail from vger. > Even majordomo isn't replying to my pleas for help. Arggh! > Yet all other incoming email seems to be fine.] news.gmane.org > True. The constant reapplication does really slow it down. So does > grabbing the reverse patch and seeing if it applies backwards > cleanly. Neither operation is fast, and neither is really going > to be fast. I realised that, depending on the number of patches merged upstream, using this option can make StGIT faster. That's because when pushing a patch (without the --merged option), StGIT first tries a diff | apply followed by a three-way merge (even slower) if the former method fails. This means that for all the patches merged upstream, StGIT tries both methods since diff | apply fails anyway. With the --merged option, StGIT would only try the reverse-diff | apply and, if this succeeds, it will skip the normal push methods. -- Catalin