-- Alexander Veremyev <[EMAIL PROTECTED]> wrote (on Tuesday, 22 July 2008, 06:44 AM -0700): > Since release-1.6 branch is created last Saturday and we continue > maintenance of the release-1.5 branch now, we have two branches for > merging changes from the trunk. > > 1. Bug fixes for the code which is common for both releases must come > into _both_ branches. > Otherwise they will not be included into ZF 1.5.3 or 1.6.x up to ZF 1.7. > > 2. Fixes and code intended to be included into ZF 1.6 must be merged > only into release-1.6 branch.
Rule of thumb: if the change is _new_ functionality for an existing component, it should go into the 1.6 branch, and not the 1.5 branch. If the change is a _bugfix_ or _security_ fix to an existing component, please merge to both. > 3. New features development should stay in trunk. -- Matthew Weier O'Phinney Software Architect | [EMAIL PROTECTED] Zend Framework | http://framework.zend.com/
