[Zope-Checkins] CVS: Products/Transience - TransientObject.py:1.9.68.4.2.3

[Chris McDonough]

Update of /cvs-repository/Products/Transience
In directory cvs.zope.org:/tmp/cvs-serv32054

Modified Files:
      Tag: chrism-pre273-branch
	TransientObject.py 
Log Message:
Reenable conflict resolution for TransientObjects.


=== Products/Transience/TransientObject.py 1.9.68.4.2.2 => 1.9.68.4.2.3 ===
--- Products/Transience/TransientObject.py:1.9.68.4.2.2	Tue Sep 14 17:35:30 2004
+++ Products/Transience/TransientObject.py	Fri Sep 17 22:46:40 2004
@@ -193,12 +193,7 @@
     # Other non interface code
     #
 
-    def _not_p_independent(self):
-        # My state doesn't depend on or materially effect the state of
-        # other objects (eliminates read conflicts).
-        return 1
-
-    def _dont_p_resolveConflict(self, saved, state1, state2):
+    def _p_resolveConflict(self, saved, state1, state2):
         DEBUG and TLOG('entering TO _p_rc')
         DEBUG and TLOG('states: sv: %s, s1: %s, s2: %s' % (
             saved, state1, state2))