On Apr 9, 10:19 am, "Edward K. Ream" <[EMAIL PROTECTED]> wrote:
> Merging these changes from the ekr-devel branch to the trunk branch > produced a few minor surprises, but nothing major. > > Let the wild rumpus start! My present rule of thumb when merging from local branch a to local branch b: just make sure that bzr status reports nothing to do in either branch. That way, a bzr revert in either branch will put things right, no matter what happens. In other words, using bzr feels substantially safer than any other environment I've ever used. This reduction of the fear factor is significant. With this confident attitude, I'll soon be attempting two major merges into ekr-devel: - The leo-as-a-package merge: mostly affects plugins. - The thyrsus merge: localized to one or two files, but highly significant. We can take a few days for testing in ekr-devel before the final merge into the trunk. So bzr promotes parallel development and reduces waiting. 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 -~----------~----~----~----~------~----~------~--~---
