[Zope3-checkins] CVS: Zope3/src/zodb/btrees - MergeTemplate.c:1.6

[Tim Peters]

Update of /cvs-repository/Zope3/src/zodb/btrees
In directory cvs.zope.org:/tmp/cvs-serv18479/src/zodb/btrees

Modified Files:
	MergeTemplate.c 
Log Message:
bucket_merge():  Deleted obsolete XXX comment block.


=== Zope3/src/zodb/btrees/MergeTemplate.c 1.5 => 1.6 ===
--- Zope3/src/zodb/btrees/MergeTemplate.c:1.5	Fri Jan 17 11:44:33 2003
+++ Zope3/src/zodb/btrees/MergeTemplate.c	Wed Jan 22 11:32:36 2003
@@ -71,9 +71,6 @@
  * the keys.  This is a higher-level constraint, due to that the caller of
  * bucket_merge() doesn't have enough info to unlink the resulting empty
  * bucket from its BTree correctly.
- * XXX The code below doesn't yet raise ConflictError in the empty-output-
- * XXX bucket case.  This is a bug; the symptom is segfaults when later
- * XXX code tries to dereference NULL pointers in the empty bucket.
  *
  * Key insertion:  s2 or s3 can add a new key, provided the other transaction
  * doesn't insert the same key.  It's not OK even if they insert the same