[Zope-Checkins] Re: [Zope3-checkins] CVS: ZODB3/ZConfig -substitution.py:1.2.54.2schema.py:1.20.22.2 loader.py:1.18.44.2 info.py:1.15.12.2datatypes.py:1.13.36.2 cfgparser.py:1.7.52.2 __init__.py:1.9.22.2

[Tim Peters]

[Chris McDonough]
> This merge and others in this batch reverted some fairly important
> bugfixes made to Zope 2.7.
>
> Hopefully this is the last time we'll need to do such a thing, but I'm
> going to need to go in and manually reapply the bugfixes that were
> overwritten.  Misery. :-(

Hmm.  If the misery is confined to ZConfig, I'm not sure we (Jeremy and I)
made any deliberate ZConfig changes on ZODB3-3_2-branch.  If not, our
copying ZODB3-3_2-branch's ZConfig files to Zope-2_7-branch was just an
accident of the process, and you could just revert Zope-2_7-branch ZConfig
to some time before the overwrite.

Jeremy?  Can we spare Chris some misery here?