> -----Original Message----- > From: Thomas Weidner [mailto:[EMAIL PROTECTED] > > For example Zend_Date.... > I've integrated new features (array access). > But when there is a new bug I have to integrate it in trunk > (where the new feature resists) and in maintenance. > Otherwise the maintenance branch would also have the new > feature integrated which is not allowed.
This means there are a few choices: (a) Implement the same bug fix in a different way, to work with the code in the branch. But depending on the nature of the bug, this may be too much work. (b) Implement the bug fix in both trunk and branch, implemented in a way that doesn't rely on the new features. Sometimes this is possible, but sometimes it's not possible or it's too much work. (c) Fix the bug in the trunk but don't fix it in the branch. Users must wait until 1.1.0 to get some bug fixes. I think all cases will fit into the three choices above. :-) Regards, Bill Karwin
