So I want to merge the 'pre-release' branch, which should really be called the 'improved-recent-files-menu' branch, seeing that's all that's on it, into the trunk.
leoMenu.py merges no problem. There are conflicts in leoConfig.leo, but that's easy, just take the trunk version and paste in the new nodes from pre-release. But what about leoProjects.txt. My impulse in the past has been to just accept the trunk version, thinking it will all sort itself out in the wash. But is that true, or is it Russian roulette which clone wins, could the version in leoProjects.txt restore an old node in leoMenu.py? Or, and I almost think Edward might have commented on this recently, is the ordering of the derived files in leoPyRef.leo critical, with the last loaded always winning, hence leoProjects.txt being before Code and its many children? In which case my naïve approach would work. Cheers -Terry --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
