The fstring, docks, orange and pyzo branches have been merged into devel

17 views

Skip to first unread message

Edward K. Ream

unread,

Sep 9, 2019, 5:42:08 PM9/9/19

to leo-editor

The fstring branch is a major change to Leo's code base. I'll continue checking, and make any remaining tweaks directly in devel. This will make the changes more apparent, imo. We want to test any such changes immediately.

The docks branch had already been fully merged. It was past time to retire this branch.

The orange branch was not very useful. #1266 only affects the seldom-used beautify commands. All changes are confined to leoBeautify.py, so there is no danger at all. On the contrary, it will be valuable to test the code widely.

The pyzo branch (#1093) only affected the pyzo_in_leo.py plugin. There is no reason to use a separate branch for this.

Summary

At present, I am doing all work in devel. This is safe because the work is confined to leoBeautify.py and pyzo_in_leo.py.

I would like to delete the settings branch as well, but I have to check with Vitalije first.