[Zope-dev] Re: SVN problems merging the Zope 2.11 integration branch

Tue Jun 26 09:07:02 EDT 2007

Andreas Jung wrote:
> C    doc/CHANGES.txt
> U    lib/python/Products/Five/i18n.zcml
> U    lib/python/Products/Five/event.zcml
> U    lib/python/Products/Five/meta.zcml
> U    lib/python/Products/Five/form/tests/forms.txt
> D    lib/python/Products/Transience/tests/testCounters.py
> U    lib/python/Products/PageTemplates/www/ptEdit.zpt
> U    lib/python/ZPublisher/HTTPRequest.py
> U    lib/python/ZPublisher/tests/testHTTPRequest.py
> U    lib/python/tempstorage/tests/testTemporaryStorage.py
>  U   lib/python/zope/app
>  U   lib/python/zope
>  C   lib/python

You're getting a conflict here on the externals because you recently 
stitched RestrictedPython 3.4.1 into the trunk. I suggest resolving this 
manually.

> U    setup.py
>  U   utilities
> 
> updates only some files.

Well, perhaps only those few files were changed in the branch?

> No svn:externals are being updated.

That is hard to believe. The 'zope' and 'zope/app' externals should be ok.

-- 
http://worldcookery.com -- Professional Zope documentation and training