[Zope-dev] thread locking and ZODB

[Michel Pelletier]

On Thu, 13 Sep 2001 09:40:43 +1000
 Terry Kerr <terry@bizarsoftware.com.au> wrote:
> Chris,
> 
> I notice in the ZODB2 article that it states that the conflict
> resolution method "should return the state of the object after
> resolving
> the differences.".  However, in the example the method only returns
> the
> portion of the state that was deamed to be in conflict.  Shouldn't it
> be
> returning the entire new state dictionary?

I believe it should, and that the article is in error, but really, I wouldn't go on that without hearing from someone like Jim or Shane.

-Michel