Handling unmergeable files -- a call to arms

[Russel Winder]

Stephen,

On Mon, 2009-06-01 at 12:09 +0900, Stephen J. Turnbull wrote:
> Russel Winder writes:
> 
>  > Two thoughts:
>  > 
>  > Every branch/clone in DVCS is a separate fork of a project, it is not a
>  > member of a distributed cache.
> 
> This is false for git, at least.  That is the whole point of git's
> object database.

I guess we have to get into nitty gritty details to argue this one --
whilst fun, I am not sure it is crucially important.  The critical
question is whether two repositories can diverge independently (which
clearly then can since this is DVCS) and then be forced into consistency
by outside agents -- I am not sure that this is the case for any DVCS.
However my knowledge of Git is not sufficiently detailed to be
confident.

-- 
Russel.
=============================================================================
Dr Russel Winder      Partner
                                            xmpp: russel at russel.org.uk
Concertant LLP        t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road,   f: +44 8700 516 084   voip: sip:russel.winder at ekiga.net
London SW11 1EN, UK   m: +44 7770 465 077   skype: russel_winder
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090602/6c31e04e/attachment.pgp