[Zope-Checkins] CVS: ZODB3/ZODB - POSException.py:1.19
Jeremy Hylton
jeremy@zope.com
Wed, 15 Jan 2003 18:00:08 -0500
Update of /cvs-repository/ZODB3/ZODB
In directory cvs.zope.org:/tmp/cvs-serv3200
Modified Files:
POSException.py
Log Message:
Fix explanation of serials attribute of ConflictError.
=== ZODB3/ZODB/POSException.py 1.18 => 1.19 ===
--- ZODB3/ZODB/POSException.py:1.18 Fri Jan 3 17:08:22 2003
+++ ZODB3/ZODB/POSException.py Wed Jan 15 18:00:05 2003
@@ -53,9 +53,9 @@
a human-readable explanation of the error
serials : (string, string)
a pair of 8-byte packed strings; these are the serial numbers
- (old and new) of the object in conflict. (Serial numbers are
- closely related [equal?] to transaction IDs; a ConflictError may
- be triggered by a serial number mismatch.)
+ related to conflict. The first is the revision of object that
+ is in conflict, the second is the revision of that the current
+ transaction read when it started.
The caller should pass either object or oid as a keyword argument,
but not both of them. If object is passed, it should be a