[Zope-Checkins] CVS: Zope2 - History.py:1.6.4.1

[evan@serenade.digicool.com]

Update of /cvs-repository/Zope2/lib/python/OFS
In directory serenade:/home/evan/Zope/pt/lib/python/OFS

Modified Files:
      Tag: zope-2_3-branch
	History.py 
Log Message:
Get rid of current attributes before copying a historical state to the present.


--- Updated File History.py in package Zope2 --
--- History.py	2001/01/11 21:12:27	1.6
+++ History.py	2001/06/04 18:37:01	1.6.4.1
@@ -212,6 +212,9 @@
         if serial != self._p_serial:
             self.manage_beforeHistoryCopy()
             state=self._p_jar.oldstate(self, serial)
+            # Scrub the object before restoring the old state
+            self._p_changed=0
+            self._p_deactivate()
             self.__setstate__(state)
             self._p_changed=1
             self.manage_afterHistoryCopy()