Re: pull into dirty working tree

From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Jun 15, 2007, 03:33 UTC
Message-ID: <46a038f90706142033p1b7f5b49uc5b4af72b0419c8e@mail.gmail.com>
In-Reply-To: <alpine.LFD.0.98.0706141801030.14121@woody.linux-foundation.org>

On 6/15/07, Linus Torvalds <torvalds@linux-foundation.org> wrote:

> But yeah, if you can check in stage 1 (_without_ changing the working
> tree) whether the merge will work, then everything is fine.

Aha- so at phase 1 we know
 - what paths are dirty in the checkout
 - what paths of the merge need an actuall diff3 merge

perhaps we can do those diff3 merges elsewhere (tempfiles). If they are trivial diff3 merges, then we can complete the merge operation without touching the checkout. After this is complete, we can then update the checkout...

cheers,