Re: [Monotone-devel] What are rosters?

[Brian May]

>>>>> "William" == William Uther <address@hidden> writes:

    William> - I think this procedure is equivalent to mark-merge:
    William> - If a node is in the same state on both sides of a merge then  it
    William> is in that state in the result.  Otherwise,
    William> - If a node is in different states on either side of a merge  then
    William> we check the uncommon ancestors (UA) on each side of the merge  for
    William> marks.  If one side has a mark and the other side doesn't, then  
that
    William> side wins cleanly.  If both sides have a mark then there is a
    William> conflict.
    William> - If the nodes are in a different state on each side of the
    William> merge, but neither set of uncommon ancestors has a mark, then we've
    William> got an invariant failure.

Sounds good to me, so far.

How would you deal with conflicts?

Just to confirm I have understood this correctly: would this mean it
is possible to undelete a file that was deleted?
-- 
Brian May <address@hidden>