[Zodb-checkins] CVS: Zope/lib/python/ZODB - FileStorage.py:1.98.2.5

[Tres Seaver]

Update of /cvs-repository/Zope/lib/python/ZODB
In directory cvs.zope.org:/tmp/cvs-serv2364

Modified Files:
      Tag: Zope-2_6-branch
	FileStorage.py 
Log Message:


 - Disentangle conflict markers from ZODB3-3_1-branch merge.

   o N.B.:  two tests are still failing, with ZEO2 installed into
     Zope's 'lib/python':

     - 'checkTransactionalUndoAfterPackWithObjectUnlinkFromRoot'
       pukes on a TypeError, calling 'undoLog' with only 1 argument.

     - 'checkUndoInVersion' raises an AttributeError.

     But at least one can build Zope to run the tests.


=== Zope/lib/python/ZODB/FileStorage.py 1.98.2.4 => 1.98.2.5 ===
--- Zope/lib/python/ZODB/FileStorage.py:1.98.2.4	Wed Dec 18 16:59:19 2002
+++ Zope/lib/python/ZODB/FileStorage.py	Thu Dec 19 00:00:54 2002
@@ -387,17 +387,6 @@
                 return 0 # insane
             seek(pos)
             s = read(TRANS_HDR_LEN)
-<<<<<<< FileStorage.py
-            tid, stl, status, ul, dl, el = unpack(TRANS_HDR, s)
-            if not ltid: ltid=tid
-            if stl != rstl: return 0 # inconsistent lengths
-            if status == 'u': continue # undone trans, search back
-            if status not in ' p': return 0
-            if tl < (TRANS_HDR_LEN + ul + dl + el): return 0
-            tend=pos+tl
-            opos=pos+(TRANS_HDR_LEN + ul + dl + el)
-            if opos==tend: continue # empty trans
-=======
             tid, stl, status, ul, dl, el = unpack(TRANS_HDR, s)
             if not ltid:
                 ltid = tid
@@ -413,17 +402,10 @@
             opos = pos+(TRANS_HDR_LEN + ul + dl + el)
             if opos == tend:
                 continue # empty trans
->>>>>>> 1.105.2.11
 
             while opos < tend and checked < max_checked:
                 # Read the data records for this transaction
                 seek(opos)
-<<<<<<< FileStorage.py
-                h=read(DATA_HDR_LEN)
-                oid,serial,sprev,stloc,vlen,splen = unpack(DATA_HDR, h)
-                tloc=U64(stloc)
-                plen=U64(splen)
-=======
                 h = read(DATA_HDR_LEN)
                 oid, serial, sprev, stloc, vlen, splen = unpack(DATA_HDR, h)
                 tloc = U64(stloc)
@@ -432,7 +414,6 @@
                 dlen = DATA_HDR_LEN+(plen or 8)
                 if vlen:
                     dlen = dlen+(16+vlen)
->>>>>>> 1.105.2.11
 
                 if opos+dlen > tend or tloc != pos:
                     return 0 # insane