[Zodb-checkins] SVN: ZODB/trunk/src/ZODB/ConflictResolution.txt corrected documentation: _p_ResolveConflict must raise ConflictError if it

[Christian Zagrodnick]

Log message for revision 100630:
  corrected documentation: _p_ResolveConflict must raise ConflictError if it
  cannot resolve.
  
  

Changed:
  U   ZODB/trunk/src/ZODB/ConflictResolution.txt

-=-
Modified: ZODB/trunk/src/ZODB/ConflictResolution.txt
===================================================================
--- ZODB/trunk/src/ZODB/ConflictResolution.txt	2009-06-04 08:38:19 UTC (rev 100629)
+++ ZODB/trunk/src/ZODB/ConflictResolution.txt	2009-06-04 11:00:24 UTC (rev 100630)
@@ -56,8 +56,9 @@
                 This method should compute a new state by merging changes
                 reflected in savedState and newState, relative to oldState.
 
-                If the method cannot resolve the changes, then it should
-                return None.    
+            If the method cannot resolve the changes, then it should raise
+            ZODB.POSException.ConflictError.
+            
 
     Consider an extremely simple example, a counter::