[Zope] _p_resolveConflict not called on conflict

[Chris Withers]

Martijn Pieters wrote:
> See the "Caveats and Dangers" section in:
> 
>   http://svn.zope.org/ZODB/trunk/src/ZODB/ConflictResolution.txt?rev=77078&view=markup
> 
> Conflict Resolution is a feature of a ZODB storage, and as the storage
> is the responsibility of the ZEO server, takes place there.

We, not quite, I suspect ;-)

If the conflict occurs between two threads on one app server, then I 
would expect conflict resolution to happen on the app server and not the 
storage...

cheers,

Chris

-- 
Simplistix - Content Management, Zope & Python Consulting
            - http://www.simplistix.co.uk