Hi,
+1
I would also close Qt 5.14 branch already now.
The other option is that some fixes pushed into Qt 5.14 branch at the time of
Qt 5.15 RC1 only land in Qt 5.15.1.
Neither of these is problematic to me, assuming that the change that may be
landing to 5.14 in the last minute is not a as such a blocker for Qt 5.15
release.
Yours,
Tuukka
On 20.4.2020, 8.28, "Development on behalf of Jani Heikkinen"
<[email protected] on behalf of [email protected]> wrote:
> -----Original Message-----
> From: Development <[email protected]> On Behalf Of
> Volker Hilsheimer
> Sent: lauantai 18. huhtikuuta 2020 12.22
> To: Thiago Macieira <[email protected]>
> Cc: [email protected]
> Subject: Re: [Development] Finishing the transition to the cherry-pick
model
>
> > On 18 Apr 2020, at 02:50, Thiago Macieira <[email protected]>
> wrote:
> >
> > On Friday, 17 April 2020 10:31:04 -03 Volker Hilsheimer wrote:
> >>> Please disable merging only after 5.14 branch is closed, so all
> >>> changes to it make it into 5.15.0.
> >>>
> >>> The 5.14 branch closes the moment 5.15.0-rc1 is out.
> >>
> >> To clarify, we don’t “disable merging”, we turn off the bot. People
> >> with the privilege to push merge commits can in theory continue to do
so
> forever.
> >
> >> Merging 5.14 into 5.15 fully before the RC will be part of the manual
> >> merge process.
> >
> > Ok, so can we close the 5.14 branch before we change to cherry-pick
> > mode? That will only leave 5.15 to dev, which we can coordinate.
>
> Yes, that’s the intention.
>
Yeah. If we want to get all changes from '5.14' to Qt 5.15.0 we has to
close it before RC & also do the final merge from '5.14' to '5.15.0' before it.
Because we aren't planning to do new releases from '5.14' should we just remove
staging option from '5.14' already now to be able to do final merge from '5.14'
to '5.15' before final downmerge to '5.15.0'? I think we should.
br,
Jani
_______________________________________________
Development mailing list
[email protected]
https://lists.qt-project.org/listinfo/development
_______________________________________________
Development mailing list
[email protected]
https://lists.qt-project.org/listinfo/development
