corrected documentation: _p_ResolveConflict must raise ConflictError if it

cannot resolve.

corrected documentation: _p_ResolveConflict must raise ConflictError if it
cannot resolve.
252219aa · Christian Zagrodnick · 2d471260 · 252219aa
Commit 252219aa authored Jun 04, 2009 by Christian Zagrodnick
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

src/ZODB/ConflictResolution.txt src/ZODB/ConflictResolution.txt +3 -2

No files found.
--- a/src/ZODB/ConflictResolution.txt
+++ b/src/ZODB/ConflictResolution.txt
@@ -56,8 +56,9 @@ use:
                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::