So that if Zope X3-3.0 final is released while I'm on vacation,
it will have the right ZODB stuff in it (although I still need
to stitch this in to the Zope 3 and X3 trees).

New test checkReadConflictErrorClearedDuringAbort().

This confirms that 3.3 didn't have the 3.2.4c1 bug wherein
an explict transaction abort() failed to clear Connections'
memory of ReadConflictErrors.

This confirms that 3.3 didn't have the 3.2.4c1 bug wherein
an explict transaction abort() failed to clear Connections'
memory of ReadConflictErrors.

Act as if a 3.3c1 release were being made.  Maybe it will
be.  Besides "the usual" release fiddling, repaired many
out-of-date pieces of the ZODB programming guide; I'm sure
many remain, though.

be.  Besides "the usual" release fiddling, repaired many
out-of-date pieces of the ZODB programming guide; I'm sure
many remain, though.

A test here didn't clean up after a failing commit().

transaction when a commit() fails.  One test here provoked a
failing commit(), which caused a later test to fail.  Repaired
by simply abort()'ing the failed transaction.

Removed obsolete comment.

As discussed on zodb-dev, failing commit "sticks" now.

After a commit fails (raises an exception), all subsequent attempts
to commit, join, or register with the transaction now raise the new
TransactionFailedError.  The failed transaction must be explicitly
discarded now, via abort() on the transaction or begin() on its
transaction manager.

After a commit fails (raises an exception), all subsequent attempts
to commit, join, or register with the transaction now raise the new
TransactionFailedError.  The failed transaction must be explicitly
discarded now, via abort() on the transaction or begin() on its
transaction manager.

Officially deprecate Transaction.begin().

more was incomprehensible.  Tried to repair that.  Plus
random improvements to ReST markup.

Forward port from Zope 2.7 branch.

The ConflictError.get_{old,new}_serial() methods each did what the other
was supposed to do.

The ConflictError.get_{old,new}_serial() methods each did what the other
was supposed to do.

Port from Zope 2.7 branch.

Collector #1488 (TemporaryStorage -- going backward in time).

This confusion was really due to that the detail on a ConflictError
exception didn't make sense.

Collector #1488 (TemporaryStorage -- going backward in time).

This confusion was really due to that the detail on a ConflictError
exception didn't make sense.

Forward port from Zope 2.7 branch.

_handle_independent():  Failed to record that a ReadConflictError
was raised for an object with a _p_independent() method that
returned false.

_handle_independent():  Failed to record that a ReadConflictError
was raised for an object with a _p_independent() method that
returned false.

Raise ConnectionStateError if an attempt to close a connection
is made while the connection has a pending subtransaction.

is made while the connection has a pending subtransaction.

Transaction.begin() didn't do anything.

begin() is supposed to abort the current transaction, but
Transaction.begin() did not.  Calling begin() on a transaction
*manager* worked fine, and is the intended way to do a begin()
in 3.3.  But calling begin() on a Transaction object is still
very easy to do (e.g., the older get_transaction().begin()
spelling still works), and shouldn't be a subtle disaster.

begin() is supposed to abort the current transaction, but
Transaction.begin() did not.  Calling begin() on a transaction
*manager* worked fine, and is the intended way to do a begin()
in 3.3.  But calling begin() on a Transaction object is still
very easy to do (e.g., the older get_transaction().begin()
spelling still works), and shouldn't be a subtle disaster.

Empty BTrees/__init__.py; isn't doing anything except
creating problems.

creating problems.

It's possible that an oid is referenced despite never being
defined (well, it's not *supposed* to be possible ...).