[Zodb-checkins] CVS: ZODB3 - setup.py:1.20.2.4 NEWS.txt:1.17.2.12

[Jeremy Hylton]

Update of /cvs-repository/ZODB3
In directory cvs.zope.org:/tmp/cvs-serv1715

Modified Files:
      Tag: ZODB3-3_1-branch
	setup.py NEWS.txt 
Log Message:
Fix two restore() bugs.

Merge changes from short-lived ZODB3-restore-debug-branch.
Add entry to NEWS file about problem.
Bump version numbers to 3.1.1 and 2.0.1.


=== ZODB3/setup.py 1.20.2.3 => 1.20.2.4 ===
--- ZODB3/setup.py:1.20.2.3	Wed Oct 23 15:46:52 2002
+++ ZODB3/setup.py	Fri Nov 15 12:18:56 2002
@@ -176,7 +176,7 @@
 doclines = __doc__.split("\n")
 
 setup(name="ZODB3",
-      version="3.1",
+      version="3.1.1",
       maintainer="Zope Corporation",
       maintainer_email="zodb-dev@zope.org",
       url = "http://www.zope.org/Wikis/ZODB/FrontPage",


=== ZODB3/NEWS.txt 1.17.2.11 => 1.17.2.12 ===
--- ZODB3/NEWS.txt:1.17.2.11	Wed Nov 13 15:14:59 2002
+++ ZODB3/NEWS.txt	Fri Nov 15 12:18:56 2002
@@ -22,6 +22,11 @@
 the object was loaded.  An attempt to load an uncreated object now
 raises KeyError, as expected.
 
+The restore() implementation in FileStorage wrote incorrect
+backpointers for a few corner cases involving versions and undo.
+These specific bugs have been fixed and new test cases were added to
+cover them.
+
 A bug was fixed in conflict resolution that raised a NameError when a
 class involved in a conflict could not be loaded.  The bug did not
 affect correctness, but prevent ZODB from caching the fact that the