[Zodb-checkins] SVN: ZODB/trunk/ Try to merge revs 30425 30426 30427 30428 from 3.4 branch.

[Tim Peters]

Log message for revision 30433:
  Try to merge revs 30425 30426 30427 30428 from 3.4 branch.
  
  Stitch in ZConfig as an SVN external.
  Use the same tag Zope trunk (2.8) is using.
  
  This is probably hosed for a bit, since it's trying to delete and
  re-insert ZConfig at the same time.
  

Changed:
  U   ZODB/trunk/releases/ZODB3/zodb3.map
  _U  ZODB/trunk/src/

-=-
Modified: ZODB/trunk/releases/ZODB3/zodb3.map
===================================================================
--- ZODB/trunk/releases/ZODB3/zodb3.map	2005-05-19 20:10:41 UTC (rev 30432)
+++ ZODB/trunk/releases/ZODB3/zodb3.map	2005-05-19 20:18:35 UTC (rev 30433)
@@ -1,7 +1,4 @@
 # These packages are used to provide the standalone ZODB distribution.
-# This package map can be addressed as
-#
-#   svn://svn.zope.org/repos/main/ReleaseSupport/trunk/PackageMaps/zodb3.map
 
 # This is the ZODB3 release package:
 #
@@ -27,5 +24,5 @@
 
 # These are copied in from the ZConfig and zdaemon projects:
 #
-ZConfig         svn://svn.zope.org/repos/main/ZODB/tags/*/src/ZConfig
+ZConfig         svn://svn.zope.org/repos/main/ZConfig/tags/ZConfig-2.3
 zdaemon         svn://svn.zope.org/repos/main/ZODB/tags/*/src/zdaemon


Property changes on: ZODB/trunk/src
___________________________________________________________________
Name: svn:externals
   + ZConfig        svn://svn.zope.org/repos/main/ZConfig/tags/ZConfig-2.3