From 3610f045bce8d0c8eef726eec7458e4f5dcb7301 Mon Sep 17 00:00:00 2001
From: Kirill Smelkov <kirr@nexedi.com>
Date: Wed, 22 Feb 2017 21:57:55 +0300
Subject: [PATCH] .

---
 t/neo/storage/fs1/filestorage.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/t/neo/storage/fs1/filestorage.go b/t/neo/storage/fs1/filestorage.go
index 28c62ac8..6f357bd8 100644
--- a/t/neo/storage/fs1/filestorage.go
+++ b/t/neo/storage/fs1/filestorage.go
@@ -203,6 +203,10 @@ func (fs *FileStorage) Load(xid zodb.Xid) (data []byte, tid zodb.Tid, err error)
 		return nil, zodb.Tid(0), &ErrXidLoad{xid, &zodb.ErrXidMissing{Xid: xid}}
 	}
 
+	// even if we will scan back via backpointers, the tid returned should
+	// be of first-found transaction
+	tid = dh.Tid
+
 	// scan via backpointers
 	for dh.DataLen == 0 {
 		var xxx [8]byte	// XXX escapes ?
@@ -227,7 +231,7 @@ func (fs *FileStorage) Load(xid zodb.Xid) (data []byte, tid zodb.Tid, err error)
 		return nil, zodb.Tid(0), &ErrXidLoad{xid, err}
 	}
 
-	return data, dh.Tid, nil
+	return data, tid, nil
 }
 
 func (fs *FileStorage) Close() error {
-- 
2.30.9