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 ...).

automated test.  There were so many oddities getting that test
to pass, and so much consequent fiddling of other code, that I
don't intend to merge this to the 3.3 branch.  Also moved to
current Python CVS doctest.py, because the test really needs
the +ELLIPSIS option (tids vary across runs).

started with a pickle GLOBAL opcode.  Curiously, it handled the
case of starting with a MARK GLOBAL opcode *sequence* fine.

FileIterator.next():  the code for reading the user, description,
and extension fields from a transaction was fatally confused,
usually reading them out of the object pickle by mistake.  This
caused several tools to display binary gibberish.

and extension fields from a transaction was fatally confused,
usually reading them out of the object pickle by mistake.  This
caused several tools to display binary gibberish.

Forward port from Zope 2.7 branch.

analyze_rec():  This produced spurious "len of unsized object" messages
when a data record had a backpointer instead of a pickle.  Repaired.

analyze(), analyze_trans():  Simplified overly elaborate iteration code.

analyze_rec():  This produced spurious "len of unsized object" messages
when a data record had a backpointer instead of a pickle.  Repaired.

analyze(), analyze_trans():  Simplified overly elaborate iteration code.

Forward port from Zope 2.7 branch.

Many changes to fsrefs.py, based on problems I hit using it in real life.

Many changes to fsrefs.py, based on problems I hit using it in real life.

Forward port from Zope 2.7 branch.

oid_repr():  Make it obvious which base is intended.  The output was
3-way ambiguous.

oid_repr():  Make it obvious which base is intended.  The output was
3-way ambiguous.

Just changing what we're calling the next release.

Please don't do that:  ZODB changes need to be done in the ZODB
project.  Checkins to Zope3 have no effect on ZODB in reality.

This includes:

r26945 | jim | 2004-08-06 18:30:44 -0400 (Fri, 06 Aug 2004) | 6 lines
   M /Zope3/trunk/src/persistent/tests/test_persistent.py

Updated to work with the versions of doctest from Python with versions
  greater than or equal to 2.3.0 and less than 2.4.0.a2 and with
  versions greater than 2.4.0a2.

r26482 | srichter | 2004-07-13 13:07:03 -0400 (Tue, 13 Jul 2004) | 2 lines
   M /Zope3/trunk/src/transaction/__init__.py
   M /Zope3/trunk/src/transaction/_transaction.py
   M /Zope3/trunk/src/transaction/tests/test_transaction.py

Converted XXX to TODO.

r25953 | sidnei | 2004-06-23 13:14:20 -0400 (Wed, 23 Jun 2004) | 1 line
   M /Zope3/trunk/src/ZODB/interfaces.py
   M /Zope3/trunk/src/transaction/_transaction.py

Add missing sortKey method to ZopeDBTransactionManager and DataManagerAdapter,
and also add it to the interface.

r25273 | philikon | 2004-06-06 04:43:57 -0400 (Sun, 06 Jun 2004) | 4 lines
Changed paths:
   M /Zope3/trunk/src/BTrees
   M /Zope3/trunk/src/ZODB
   M /Zope3/trunk/src/persistent

Ignore .so files.

This fix should probably be merged to the original ZODB tree.