On Fri, Aug 28, 2009 at 11:12 AM, Edward K. Ream <[email protected]>wrote:
> > > I would indeed like to merge the newly-updated trunk into the one-node >> > branch. >> >> On second thought, this does not look like a great idea. Bzr seems to >> want to revert some important one-node code. > > On third though, merging *into* the one-node branch was essential. There were a number of conflicts and reversions that had to be sorted out. The result is at rev 2232 of the one-node branch. The next step will be to merge the one-node branch into a trial copy of the trunk. Soon. 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 -~----------~----~----~----~------~----~------~--~---
