On Mon, Sep 7, 2009 at 7:20 PM, Edward K. Ream <[email protected]> wrote:
>> You don't necessarily need to fix it there, just fix it in 46-maint and >> merge it to trunk. > > Huh? The bug had better have been fixed in the 46-maint branch. If not, it > was released in Leo 4.6.3. I was thinking of a situation where we "start again" from before you merged trunk to the branch. > I am thinking just now that the trunk is likely to be much more reliable > than the 46-maint branch, either as the 46-maint branch exists now, or as it > might become after reversions, cherry picking, etc. If we revert to a state soon after 4.6.2, we can do things more carefully. Note that we would do this by just branching an old revision of 46-maint (bzr branch -r), and start executing our operations as if these problems never happened. In essence, we would cherry-pick the things we want (and only the things we want) from trunk. > The great advantage of the present trunk is that a lot of people are using > it. My assumption is that all unit tests are likely to pass whatever we do > to the 46-maint branch. In other words, the unit tests won't catch any > blunders. I am less confident in trunk right now, since it has much more new features than actual bugfixes. In any case, 4.6.3 would be a misleading version number. I'd just like to have a 4.6.4 based on 4.6.2, but with cache fix + windows exe installer. After that, it would be "business as usual" when we do 4.6.5. We really need a bit more mileage for trunk before we cut 4.7. > Ok. But because of my bzr blunders, I'm thinking that it would be best to > base a new 463-maint branch on the present trunk. All the bzr blunders will be forgiven/forgotten by "bzr branch -r" :-). -- Ville M. Vainio http://tinyurl.com/vainio --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "leo-editor" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/leo-editor?hl=en -~----------~----~----~----~------~----~------~--~---
