-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Stephan Richter wrote: > On Monday 04 April 2005 03:38, Dmitry Vasiliev wrote: > >>doc/TODO.txt says: >> >>""" >>Bugs starting with * represent bugs that must be fixed for the 3.0.x branch >>as well. >>""" >> >>Should the bugs be fixed only for branches/ZopeX3-3.0 or for >>branches/ZopeX3-3.0.0-Zope-2.8 as well? > > > I think the ZopeX3-3.0 branch will be enough, simply because we cannot > require > Zope 3 developers to test Zope 2 stuff as well. It will be the job of the > Five integration people to port all changes to the other branch.
It would be helpful if the original repair stays on a branch, labeled with the collector ID of the bug, until after the 2.8 merge is complete (rather than fixing directly on the 3.0 branch). So, the rhythm would be something like: - Create a bugfix branch from the 3.0 release branch. - Write tests which fail when exercising the bug on the fix branch. - Make the tests pass by repairing the bug on the fix branch. - Merge the fix branch to the 3.0 release branch and to the trunk. This isn't really more work than sitting directly on the release branch, and it is *less* work than starting from the trunk and trying to backport the fix to the release. Tres. - -- =============================================================== Tres Seaver [EMAIL PROTECTED] Zope Corporation "Zope Dealers" http://www.zope.com -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.5 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCUcCwGqWXf00rNCgRAsuKAJ0cdMNihXETYoYzqROr9AaByBh2ewCgikiT OuGZtTUbTLXYBMV02tCCZHU= =vJLN -----END PGP SIGNATURE----- _______________________________________________ Zope3-dev mailing list Zope3-dev@zope.org Unsub: http://mail.zope.org/mailman/options/zope3-dev/archive%40mail-archive.com