About the upcoming 6.2 branch

Edward K. Ream

unread,

Mar 11, 2020, 6:00:29 AM3/11/20

to leo-editor

I'd like to try a new model for releases. The following work flow should allow us all to continue using devel while releasing Leo 6.2.

The plan

1. When Leo 6.2 is code complete I'll create a new 6.2 branch, based on devel.

Leo 6.2 b1 and 6.2 final will be based on the 6.2 branch, not devel.

2. devel should never be merged into the 6.2 branch.

Instead, I'll merge 6.2 branch into devel one or more times, depending on what changes are made to the 6.2 branch.

I'll update the version numbers in devel once, after releasing Leo 6.2 final.

Details

- All release work should be done in the 6.2 branch.

- Matt and I should be the only ones working in this branch.

- Any last-minute code changes should be made to the 6.2 branch, not devel.

- I'll document Leo 6.2 in devel before creating the 6.2 branch.

After creating the 6.2 branch, any changes to the docs should be made in the 6.2 branch.

Summary

It will be several days before I create the 6.2 branch, so there is plenty of time to tweak this plan based on your comments.

Edward

Matt Wilkie

unread,

Mar 12, 2020, 5:55:53 PM3/12/20

to leo-editor

Hi Edward,

I understand the logic behind only releasing from certain named branches. I don't get why never merge from (any branch) into a release branch. I'm not questioning the wisdom I just don't understand what is being acheived.

And, thanks for extending me trust. I'll endeavour to not be clumsy with it. :-)

-matt

Edward K. Ream

unread,

Mar 13, 2020, 5:55:36 AM3/13/20

to leo-editor

On Thu, Mar 12, 2020 at 4:55 PM Matt Wilkie <map...@gmail.com> wrote:

I don't get why never merge from (any branch) into a release branch.

Yesterday I updated #1058 to describe the process. The rule is that devel should never be merged into a release branch. The rationale is straightforward: we want to be able to freely merge new branches into devel while a release is in progress.

For example, 6.2 will contain only 6.2 stuff, but devel might soon contain 6.3 stuff.

Otoh, suppose someone reports a bug that really should be fixed in 6.2. I'll create a branch based on 6.2 (not devel), fix the bug, and merge branch into both devel and 6.2.

Edward

Matt Wilkie

unread,

Mar 13, 2020, 6:01:37 PM3/13/20

to leo-editor

Ahh, the light dawns. Thanks :)

Edward K. Ream

unread,

Mar 14, 2020, 7:24:12 AM3/14/20

to leo-editor

On Fri, Mar 13, 2020 at 5:01 PM Matt Wilkie <map...@gmail.com> wrote:

Ahh, the light dawns. Thanks :)

You're welcome. Glad it makes sense. I'm quite pleased with the new scheme.

Edward

Reply all

Reply to author

Forward