[Zope3-dev] Re: CHANGES.txt

[Tres Seaver]

Bjorn Tillenius wrote:

> Where should one record bug fixes? In the trunk's, or release branch's
> CHANGES.txt?
> 
> At the moment, no bug fixes have been recorded in the release branch's
> CHANGES.txt, only in the trunk's. Shouldn't all bug fixes be fixed on
> the release branch as well, thus 3.1.0 shouldn't really contain any bug
> fixes, they should already be in the latest 3.0 release?

The "stock" policy for CVS was "bug fixes in the branch version, new 
features in the head."

BTW, bug fixes should be implemented *first* in the relase branch, and 
then forward-ported to the trunk;  the chance of breaking compatibility 
is *much* smaller when done that way.  The SOP should be something like:

  1. Ensure that all tests pass on the release branch.

  2. Apply the report's patch to the unit tests on the release branch
     (or write a test on the release branch, the the report didn't supply
     one).  *Don't* apply the fix yet!

  3. Run the new test(s) and *ensure that it fails*!!!!

  4. Apply the report's patch to the non-test code (or do the fix
     yourself).

  5. Ensure that *all* tests pass on the branch.

  6. Edit the branch's CHANGES.txt to describe the bugfix.

  7. Commit the changes to the branch.

  8. Ensure that all tests pass on the head.

  9. Forward-port the changes from the branch to the trunk.

  10. Ensure that all tests pass on the trunk.

  11. Commit the changes to the trunk.


Tres.
-- 
===============================================================
Tres Seaver                                tseaver at zope.com
Zope Corporation      "Zope Dealers"       http://www.zope.com