I am trying to merge the /Zope211-3.4-integration branch

ajung@galactica:~/sandboxes/Zope/Zope211-3.4-integration> svn info Path: . URL: svn+ssh://andreasjung@svn.zope.org/repos/main/Zope/branches/Zope211-3.4-integration Repository Root: svn+ssh://andreasjung@svn.zope.org/repos/main Repository UUID: 62d5b8a3-27da-0310-9561-8e5933582275 Revision: 77070 Node Kind: directory Schedule: normal Last Changed Author: witsch Last Changed Rev: 76362 Last Changed Date: 2007-06-05 14:58:49 +0200 (Tue, 05 Jun 2007)

into the Zope 2 trunk:

ajung@galactica:~/sandboxes/Zope/Zope> svn info Path: . URL: svn+ssh://andreasjung@svn.zope.org/repos/main/Zope/trunk Repository Root: svn+ssh://andreasjung@svn.zope.org/repos/main Repository UUID: 62d5b8a3-27da-0310-9561-8e5933582275 Revision: 77070 Node Kind: directory Schedule: normal Last Changed Author: tseaver Last Changed Rev: 77058 Last Changed Date: 2007-06-25 17:42:39 +0200 (Mon, 25 Jun 2007)

The branch has ben cut in r76191:

svn log --verbose --stop-on-copy svn+ssh://andreasjung@svn.zope.org/repos/main/Zope/branches/Zope211-3.4-integration ..... r76191 | andreasjung | 2007-06-03 07:57:35 +0200 (Sun, 03 Jun 2007) | 2 lines Changed paths: A /Zope/branches/Zope211-3.4-integration (from /Zope/trunk:76190)

trying to get Zope 3.4 integrated with the current Zope trunk for the next 2.11 release

Trying to merge

svn merge -r 76191:HEAD svn+ssh://andreasjung@svn.zope.org/repos/main/Zope/branches/Zope211-3.4-integration

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 U setup.py U utilities

updates only some files. No svn:externals are being updated. The svn:externals on the trunk still point to ZODB 3.7 and Zope 3.3 :->

Am I missing something here?

AndreA