[ZODB-Dev] passing on _p_resolveConflict

[Jeremy Hylton]

On Mon, 2003-10-06 at 11:27, John Belmonte wrote:
> Hello,
> 
> It's not obvious from looking at the code: if a _p_resolveConflict 
> function decides that it can't resolve the conflict, must it raise a 
> ConflictError or is it sufficient to return None?

It should raise ConflictError.  If it returns None, the database wil
store None as the state of the object.

Jeremy