[QGIS-Developer] release process and merging policy

[Denis Rouzaud]

Hi Jürgen,

Thanks for the clarifications, that helps!

Cheers,
Denis

On Fri, 18 Jun 2021, 18:04 Jürgen E. Fischer, <jef at norbit.de> wrote:

> Hi Denis,
>
> On Fri, 18. Jun 2021 at 14:12:44 +0200, Denis Rouzaud wrote:
> > Is there a place where it's explained how the release process works with
> > respect to the master branch and the creation of the new release branch?
>
> I don't think so.  The release itself is done with scripts/release.pl.
>
>
> > My practical questions are:
> > * when shall we stop merging bugfixes ? or can we continue merging
> without
> >   issues? (IIRC I think we have to hold for a bit?)
>
> Merging stuff to master between the release time and the push of the
> release
> commits/branches would be bad (esp. the translations take a while to pull
> and
> push).
>
> Committing new fixes to the fresh release branch could also be postponed a
> bit
> before the packages are out - in case there have to be some packaging
> related
> updates for stuff that pops up during packaging.  Otherwise those fresh
> fixes
> would also end up in the packages.  Although that would not be actual harm
> -
> probably right the opposite - but maybe unexpected.
>
> Committing to the master branch right after the release is fine however.
>
> > * when can we start merging features to master again? (as soon as the new
> >   release-3_x branch is created?)
>
> Yes.
>
>
> Jürgen
>
> --
> Jürgen E. Fischer           norBIT GmbH             Tel. +49-4931-918175-31
> Dipl.-Inf. (FH)             Rheinstraße 13          Fax. +49-4931-918175-50
> Software Engineer           D-26506 Norden
> https://www.norbit.de
> QGIS release manager (PSC)  Germany                    IRC: jef on FreeNode
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/qgis-developer/attachments/20210618/b2c974de/attachment-0001.html>