[Zope3-checkins] Re: SVN: Zope3/branches/srichter-twisted-integration2/src/ Merge rev. 29959; external link to twisted repo.

[Philipp von Weitershausen]

Stephan Richter wrote:
> Log message for revision 38376:
>   Merge rev. 29959; external link to twisted repo.
>   
> 
> Changed:
>   _U  Zope3/branches/srichter-twisted-integration2/src/
> 
> -=-
> 
> Property changes on: Zope3/branches/srichter-twisted-integration2/src
> ___________________________________________________________________
> Name: svn:externals
>    - ZConfig        svn://svn.zope.org/repos/main/ZConfig/tags/ZConfig-2.3.1
> zdaemon        svn://svn.zope.org/repos/main/zdaemon/tags/zdaemon-1.1
> BTrees         svn://svn.zope.org/repos/main/ZODB/tags/3.6.0a3/src/BTrees
> persistent     svn://svn.zope.org/repos/main/ZODB/tags/3.6.0a3/src/persistent
> ThreadedAsync  svn://svn.zope.org/repos/main/ZODB/tags/3.6.0a3/src/ThreadedAsync
> transaction    svn://svn.zope.org/repos/main/ZODB/tags/3.6.0a3/src/transaction
> ZEO            svn://svn.zope.org/repos/main/ZODB/tags/3.6.0a3/src/ZEO
> ZODB           svn://svn.zope.org/repos/main/ZODB/tags/3.6.0a3/src/ZODB
> 
>    + BTrees         svn://svn.zope.org/repos/main/ZODB/tags/3.4.0a2/src/BTrees
> persistent     svn://svn.zope.org/repos/main/ZODB/tags/3.4.0a2/src/persistent
> ThreadedAsync  svn://svn.zope.org/repos/main/ZODB/tags/3.4.0a2/src/ThreadedAsync
> transaction    svn://svn.zope.org/repos/main/ZODB/tags/3.4.0a2/src/transaction
> ZEO            svn://svn.zope.org/repos/main/ZODB/tags/3.4.0a2/src/ZEO
> ZODB           svn://svn.zope.org/repos/main/ZODB/tags/3.4.0a2/src/ZODB
> twisted        svn://svn.twistedmatrix.com/svn/Twisted/trunk/twisted

Unfortuantely, svn properties aren't merged like text files. As a
result, you put your twisted branch on an old ZODB (3.4.0a2) and got rid
of the ZConfig and zdaemon externals.

When it comes to properties, especially svn:externals, it's better to
check twice when merging...

Philipp