26 Oct
2020
26 Oct
'20
2:02 p.m.
Hi!
On 10/26/20 6:27 AM, Ilario Gelmetti wrote:
Hi Andy!
I am not using snapshot.
I suppose that we need a reorganization in the branches in order to
start developing for the 21.something release.
The 21.something release of LibreMesh or OpenWrt?
I envision that we can do one more release of LibreMesh this year.
So, now we have:
master branch: development for 20.09 release
20.09 branch: frozen, awaiting to host final 20.09 release
We could either create a new branch like "21.xx" or change the usage of
the master and 20.09 branches (respectively to work on snapshot and on
the 20.09 release), what do you think?
My interpretation (and intention when created the 20.09 branch) of the current system is
different. Maybe it wasn't clear but for me it is:
master: all the development happens here
20.09 branch: development/fixes for the 20.09 release. Selected commits from master
(mostly bugfixes) are cherry picked through pull requests here.
So far none of the pull requests were opened also to this 20.09 branch. Maybe it is
because my intention with the 20.09 branch was not clear? Or maybe the pull requests were
not intended for the 20.09 release? And/or maybe we don't have the workpower to a
scheme like this? The idea is that in master we don't have to take think much if it
is a feature or a bugfix only, and we think when we select what to ship in the release.
What do you think?
Best!
SAn