I have cleaned Leo's branches and updated info issue #1058

28 views
Skip to first unread message

Edward K. Ream

unread,
Mar 27, 2022, 8:19:12 AM3/27/22
to leo-editor
Leo's Github branch page now contains only three branches: master, devel and felix-server4. All three branches are protected. None can be deleted.

I have deleted all other branches, including all release branches.

Leo's Github release page contains the references to permanent revision and tag info. In other words, release branches are temporary (throwaways).

I have just updated info issue #1058 (Info about branches) accordingly.

Edward

Viktor Ransmayr

unread,
Mar 27, 2022, 1:58:05 PM3/27/22
to leo-e...@googlegroups.com
Hello Edward & Felix,

What's the longer-term plan for the "felix-server4" branch?

Will it be merged into the "devel" branch soon - or - does it have a particular focus, that does not 'fit' into the "devel" branch?

With kind regards,

Viktor

Félix

unread,
Mar 27, 2022, 2:11:24 PM3/27/22
to leo-editor
Salutations Viktor,

The felix-server4 branch is specifically where I push development progress for the 'leoserver.py' file in leo/core. 

Indeed, most of the time it is equal to 'devel', but when I'm working on new server features, that's the branch where you can see and test those new server features, until they are judged stable and 'clean', after which I usually make a pull request for it to be merged in 'devel'.

In other words it's the dedicated 'feature' branch for leoserver.py development :)

Thanks for your interest! And don't hesitate to make suggestions, remarks or anything else!

Cheers!

Félix

Viktor Ransmayr

unread,
Mar 27, 2022, 2:52:51 PM3/27/22
to leo-e...@googlegroups.com
Hello Felix,

Am So., 27. März 2022 um 20:11 Uhr schrieb Félix <felix...@gmail.com>:
Salutations Viktor,

The felix-server4 branch is specifically where I push development progress for the 'leoserver.py' file in leo/core. 

Indeed, most of the time it is equal to 'devel', but when I'm working on new server features, that's the branch where you can see and test those new server features, until they are judged stable and 'clean', after which I usually make a pull request for it to be merged in 'devel'.

In other words it's the dedicated 'feature' branch for leoserver.py development :)

Thanks for your interest! And don't hesitate to make suggestions, remarks or anything else!

Thanks a lot for your quick feedback.

The main reason for asking is related to the question raised by Thomas (see https://groups.google.com/g/leo-editor/c/iMU6Wv8EgDg).

I'm interested to understand, where the main activity will / might take place ...

However now the next important step is the release of Leo 6.6.

With kind regards,

Viktor

Edward K. Ream

unread,
Mar 27, 2022, 5:48:31 PM3/27/22
to leo-editor
On Sun, Mar 27, 2022 at 1:52 PM Viktor Ransmayr <viktor....@gmail.com> wrote:

However now the next important step is the release of Leo 6.6.

Right. All new work will be assigned for the 6.6.1 release, and each issue must have its own PR.

Edward
Reply all
Reply to author
Forward
0 new messages