[Zope-dev] Re: Proposal: Scrap zpkg for Zope2 releases

[Florent Guillaume]

Tres Seaver wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Tres Seaver wrote:
>> Philipp von Weitershausen wrote:
>>>> Tres Seaver wrote:
>>>>>  svn: URL
>>>>> 'svn+ssh://svn.zope.org/repos/main/Zope/branches/tseaver-retire_zpkg/lib/python/zope/app'
>>>>> doesn't match existing URL
>>>>> 'svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/app' in
>>>>> 'lib/python/zope/app'
>>>>>
>>>>> I may have to munge 'zope/app' manually and check it in to get the merge
>>>>> done.  Anybody have another suggestion?
>>>> When replacing a subversioned directory with an external, you first need
>>>> to remove the directory and commit it. Then, in a next revision, you add
>>>> the external.
>> I'm actually going the other direction, but I think I still need two
>> transactions (first remove the external, then create and add tne directory)
> 
> OK, I have merged the 'tseaver-retire_zpkg_branch' to the 2.9 branch,
> and the 'tseaver-zpkg_retire-2.10' branch to the 2.10 branch and the trunk.
> 
> Because of the surgery involved in switching 'lib/python/zope/app' from
> an svn:external to a "real" directlry, your existing sandboxen may neeed
> some help in completing an 'svn up' (try removing the app directory, if
> it barfs there).
> 
> Note that I did *not* repair the test failure which showed up on the
> 2.10 branch / trunk while I was in the middle of the merge -- it looks
> as though it might be related to the traversal changes Florent made
> today, and the failure is the same on the 2.10 branch / trunk *without*
> the merge as *with* it.

Yep I'll check and fix those asap.

Florent

-- 
Florent Guillaume, Nuxeo (Paris, France)   Director of R&D
+33 1 40 33 71 59   http://nuxeo.com   fg at nuxeo.com