[Zope3-checkins] CVS: Zope3/src/zodb - conflict.py:1.12

[Barry Warsaw]

Update of /cvs-repository/Zope3/src/zodb
In directory cvs.zope.org:/tmp/cvs-serv26176/src/zodb

Modified Files:
	conflict.py 
Log Message:
_resolve(): Add an XXX comment about loadSerial() and IUndoStorage.


=== Zope3/src/zodb/conflict.py 1.11 => 1.12 ===
--- Zope3/src/zodb/conflict.py:1.11	Fri Mar 14 15:43:31 2003
+++ Zope3/src/zodb/conflict.py	Thu Mar 20 17:51:59 2003
@@ -168,6 +168,13 @@
             return None
         newstate = reader.getState(newpickle)
 
+        # XXX Using loadSerial() ties conflict resolution to the IUndoStorage
+        # interface.  This is a bad thing for non-versioning storages like
+        # BDBMinimalStorage and MemoryMinimalStorage because they don't
+        # support undo, and thus do not implement IUndoStorage.  IUndoStorage
+        # is the interface that defines loadSerial().  Hmm, maybe we should
+        # move loadSerial() out of that interface?
+
         p = self._storage.loadSerial(oid, oldSerial)
         try:
             old = reader.getState(p)