[Fwd: Re: [Monotone-devel] Lack of conflicts checking]

[Derek Scherger]

I meant for this to go to the list as well...

-------- Original Message --------
Subject: Re: [Monotone-devel] Lack of conflicts checking
Date: Wed, 08 Aug 2007 21:39:41 -0600
From: Derek Scherger <address@hidden>
To: Nathaniel Smith <address@hidden>

Nathaniel Smith wrote:
> But we can get this behavior through a little trick.  If you think
> about it, the marks on a scalar basically tell you whether that scalar
> should win, and a conflict is when both sides want to win.  When we
> have an edit/delete conflict, well, obviously we know the delete side
> wants to win, we can tell that from the birth mark alone.  The
> question is whether the live side has content changes that the dead
> side hasn't seen yet.  But to determine that, all we need is the mark
> on the live side...

Sorry, I don't entirely follow how the mark on the live side will tell
us if it has seen a content change that the dead side has not.

Do we just look to see if the common ancestor has a different content
mark than the live side does? I think this would say that the live side
has seen a change that the dead side has not.

Cheers,
Derek