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

[Jeremy Hylton]

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

Modified Files:
      Tag: ZODB3-2-integration-branch
	conflict.py 
Log Message:
Add comment about how method doesn't really work with ZEO.


=== Zope3/src/zodb/conflict.py 1.6 => 1.6.8.1 ===
--- Zope3/src/zodb/conflict.py:1.6	Wed Jan 15 18:28:00 2003
+++ Zope3/src/zodb/conflict.py	Fri Feb 14 15:32:37 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