The coming merge of the leo-as-a-package2 branch into the trunk has the potential to be more complex than normal due to renaming the leo \src directory to the leo\core directory.
I just did this rename in the leo-as-a-package2 branch, and then did a trial merge. Apparently nothing happened. I'm not sure this was because: 1. bzr correctly identified the renamed directory or 2. bzr didn't see the src directory and so did nothing. I hope 1 is correct, but I couldn't prove it. To be safe, therefore, I urge anyone with a valuable (to them) branch to keep the branch in synch with the trunk. That way there will be less confusion when the leo-as-a-package branch merges with the trunk. Edward P.S. I don't expert the merge to happen for several days. I first have to reconstitute the leo-as-a-package2 branch, and then there will be several days of testing. EKR --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
