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

[Jeremy Hylton]

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

Modified Files:
	conflict.py 
Log Message:
Merge the ZODB3-2-integration branch to the trunk.

The primary changes here are to port the many new ZEO features from
ZODB 3.2.  There are also many changes to the test suite.

python2.2 tells me: Ran 3755 tests in 560.277s


=== Zope3/src/zodb/conflict.py 1.6 => 1.7 ===
--- Zope3/src/zodb/conflict.py:1.6	Wed Jan 15 18:28:00 2003
+++ Zope3/src/zodb/conflict.py	Tue Feb 25 13:55:02 2003
@@ -94,6 +94,9 @@
         The exact rules are implementation dependent.  This method was
         written to make testing easier.
         """
+        # In a ZEO environment, this method isn't as useful.  If the
+        # method is called from a client, it will always return False,
+        # because the conflict resolution code runs on the server.
         meta = getClassMetadata(klass=klass)
         return meta in cls.bad_classes