On Fri, Aug 28, 2009 at 9:57 AM, Ville M. Vainio <[email protected]> wrote:
> > On Fri, Aug 28, 2009 at 5:54 PM, Edward K. Ream<[email protected]> > wrote: > > > I'll be merging the trunk into the one-node branch just as soon as I > > finish merging the 46-maint into the trunk, which is happening as I > > type this. > > If you plan to merge one-node to trunk soon anyway, I don't think > merging the other way is necessary. This is again in interest of > preserving the history cleanliness. I don't think it's a big problem > if you do it anyway, though. I would indeed like to merge the newly-updated trunk into the one-node branch. That will give us the best possible testing for the one-node branch, and it will show up any potential problems in the merge of the one-node branch into the trunk. I would like to wait a few more days before merging the one-node branch... Edward --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
