On Mon, Aug 31, 2009 at 7:13 PM, Edward K. Ream<[email protected]> wrote:
> The 46-maint branch now contains the result of a straight merge of the > trunk into the branch. Imo, this was the only safe way to go. Indeed, > the trunk fixes several caching bugs that would have made any other > kind of merges iffy. Besides, the 46-maint branch now has the > benefits of all recent changes. If we want to release all of trunk, why not create a new branch from the trunk and push it over 46-maint? That seems safer and cleaner (history-wise) than merging the trunk to current 46-maint. I can do the bzr work for that if it's ok. -- 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 -~----------~----~----~----~------~----~------~--~---
