[GSoC] Partial Cloning

[Martin Geisler]

Dirkjan Ochtman <dirkjan at ochtman.nl> writes:

> On Sat, Apr 3, 2010 at 20:53, Martin Geisler <mg at lazybytes.net> wrote:
>> If you don't have the files outside your narrow subtree, then how can
>> you know if they are conflicting?
>
> If you have the full manifest, you can probably have all merges
> succeed where files outside the (narrow) scope of this tree have only
> been changed on one side. But you'll need to block merges where both
> parents have changed any file outside of the scope, I think.

Right, that was basically what I concluded with this drawing:

                        [S2, R1]
                       /        \
  [S0, R0] --- [S1, R0]          ?
                       \        /
                        [S3, R0]

-- 
Martin Geisler

Fast and powerful revision control: http://mercurial.selenic.com/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20100403/46aeb8f4/attachment.pgp>