Commit 48423ca0 authored by Tim Peters's avatar Tim Peters

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.
parent 924ec78e
# These packages are used to provide the standalone ZODB distribution. # 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: # This is the ZODB3 release package:
# #
...@@ -27,5 +24,5 @@ zope.testing svn://svn.zope.org/repos/main/Zope3/tags/ZopeX3-3.0.0-Zope-2.8-a ...@@ -27,5 +24,5 @@ zope.testing svn://svn.zope.org/repos/main/Zope3/tags/ZopeX3-3.0.0-Zope-2.8-a
# These are copied in from the ZConfig and zdaemon projects: # 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 zdaemon svn://svn.zope.org/repos/main/ZODB/tags/*/src/zdaemon
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment