[Zope-dev] RE: [Zope3-dev] Re: svn vs. cvs (some documentation)

[Jim Fulton]

Tres Seaver wrote:
> Jim Fulton wrote:
> 
>> Brian Lloyd wrote:
>>
>> ...
>>
>>> Speaking of, the dev.zope.org/CVS/ area should probably be updated to:
>>>
>>>   1. capture the current state of affairs (2.8 / HEAD on svn      and 
>>> 2.7 on CVS), since it is currently mostly 'in the      heads' of the 
>>> various Zope devs
>>
>>
>>
>> Good point.
>>
>>>   2. translate the CVS FAQ to the svn world (recommendations      for 
>>> how to manage our 'activity branch' pattern in svn
>>>      in particular
>>
>>
>>
>> Note that this is somewhat dependent on the Zope version.
>>
>> In Zope 3, we make much less use of development branches because:
>>
>> 1. We prefer increments of change to be small.  (This might be
>>    a useful goal for Zope 2 as well.)
>>
>> 2. We have far more tests:
>>
>>    a. New code is required to have it's own tests
>>
>>    b. Tests must always pass on the trunk or on
>>       release branches.
> 
> 
> And,
> 
> 3.  Up to this point, we haven't had to be careful about managing
>     bugfixes across multiple releases.

Sure we have.  We've had a release branch for
some time.  Perhaps I should add:

4. Subversion makes it much easier to manage and
    merge changes, since repository-wide revision numbers
    provide the same capabilities as tags and, thus, make
    tagging mostly unnecessary.


 >  We also haven't had lots
>     of "independent" feature work going on in the core.

Not sure what you mean by this.

Jim

-- 
Jim Fulton           mailto:jim at zope.com       Python Powered!
CTO                  (540) 361-1714            http://www.python.org
Zope Corporation     http://www.zope.com       http://www.zope.org