On Sun, May 18, 2008 at 3:02 PM, Edward K. Ream <[EMAIL PROTECTED]> wrote:
> > Getting imports correct in the leo-as-a-package branch is turning out > to be "interesting". After the initial long post I was able to get leo-as-a-package working just as I indicated, that is, by changing leo.py to runLeo.py and by changing all imports to fully qualified imports. So the proof-of-concept is done. It appears that making the transition (merging the new code the trunk) may be the most difficult part. Indeed, a trial merge of leo-as-a-package into the trunk produced dozens of conflicts. To reduce the chances of conflicts I have started the leo-as-a-package2 branch, based on the latest trunk. I *hope* most of the conflicts from the trial merge were because the leo-as-a-package branch is based on an ancient rev of the trunk. However, because of renamed directories (src to core) there may be conflicts when merging leo-as-a-project2 into the trunk. It's possible that these problems may visit everyone, and on every branch. If so, we shall just have to live with the pain. 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 -~----------~----~----~----~------~----~------~--~---
