[Zope-Checkins] CVS: Zope2 - TreeSetTemplate.c:1.5.2.5

[Jim Fulton]

Update of /cvs-repository/Zope2/lib/python/BTrees
In directory korak:/tmp/cvs-serv825

Modified Files:
      Tag: Catalog-BTrees-Integration
	TreeSetTemplate.c 
Log Message:
added conflict resolution.



--- Updated File TreeSetTemplate.c in package Zope2 --
--- TreeSetTemplate.c	2001/02/26 17:50:26	1.5.2.4
+++ TreeSetTemplate.c	2001/03/14 14:55:20	1.5.2.5
@@ -183,6 +183,8 @@
   {"remove",	(PyCFunction)TreeSet_remove,	METH_VARARGS,
    "remove(id) -- Remove a key from the set"},
 #ifdef PERSISTENT
+  {"_p_resolveConflict", (PyCFunction) BTree__p_resolveConflict, METH_VARARGS,
+   "_p_resolveConflict() -- Reinitialize from a newly created copy"},
   {"_p_deactivate", (PyCFunction) BTree__p_deactivate,	METH_VARARGS,
    "_p_deactivate() -- Reinitialize from a newly created copy"},
 #endif