You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@netbeans.apache.org by Neil C Smith <ne...@apache.org> on 2019/06/17 16:40:42 UTC
NB11.1 Feature Freeze - master branch closed except for fixes!
Hi All,
Just a reminder that the feature freeze deadline for NB 11.1 was on
Saturday. The release branch was made earlier today, and the branding
/ config changes made - first beta should be ready tomorrow.
The only merges to master between now and release date should be
intended for NB11.1 (everything will be merged across) and ideally
with a JIRA ticket and taking into consideration NetBeans bug priority
guidelines https://cwiki.apache.org/confluence/display/NETBEANS/Bug+Priority+Guidelines
Please tag any PR intended to be merged with NB 11.1 - I'll keep an
eye out for them!
This email is prompted partly by
https://github.com/apache/netbeans/pull/1301 :-)
Thanks and best wishes,
Neil
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: NB11.1 Feature Freeze - master branch closed except for fixes!
Posted by Geertjan Wielenga <ge...@apache.org>.
Great. It is through practical scenarios like this one that we’ll figure
out how and whether our ideas work out.
Gj
On Mon, 17 Jun 2019 at 21:07, Neil C Smith <ne...@apache.org> wrote:
> On Mon, 17 Jun 2019 at 19:37, Geertjan Wielenga <ge...@apache.org>
> wrote:
> >
> > So where should that PR 1301 go, i.e., I guess, it should not be merged
> at
> > all unless it should go into 11.1?
>
> Ideally, no, particularly because it's intended for 11.2 anyway. In
> general, it depends where the urge to merge comes from. If a PR is
> fairly standalone, then we tag it with NB11.2 and merge when the
> window reopens after the release, after the spec version update and on
> top of any bug fixes.
>
> OTOH, as Jan, I and others discussed here, there might be a need to
> consider a short-lived "next" branch (or in my opinion various feature
> grouped branches) to allow for collaboration while master is closed.
> We agreed to review after NB 11.1 release, and during if it poses a
> problem earlier.
>
> In respect of PR 1301 need to consider whether to revert the commit
> and reapply later, or whether the code is OK to remain in place.
> Either way, it won't be in first beta now.
>
> Best wishes,
>
> Neil
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
> For additional commands, e-mail: dev-help@netbeans.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
>
>
Re: NB11.1 Feature Freeze - master branch closed except for fixes!
Posted by Junichi Yamamoto <ju...@gmail.com>.
Ah, maybe, I see now. This means that we will not merge PRs unrelated to
nb11.1 anywhere, right? i.e. Just wait for being released nb11.1, do
nothing for those during this phase. OK.
Thanks,
Junichi
2019年6月18日(火) 17:33 Neil C Smith <ne...@apache.org>:
> On Tue, 18 Jun 2019 at 00:18, Junichi Yamamoto <ju...@gmail.com>
> wrote:
> >
> > Let's just revert it.
>
> OK. Just replied on the PR. Revert button has disappeared, but feel
> free to revert, or I will later - first priority is first beta build.
>
> > I think we need the new branch for merging PRs unrelated to NB 11.1
> > because the current PRs are set 'master' as the base branch.
> > The same thing may happen again.
>
> May I ask why? To solve a technical issue or a social issue?
>
> IMO all PRs still need to be against master in general, or we lose all
> the benefits of doing this. We're only talking about closing the
> merge window for a few weeks every few months. Merging pending PRs at
> the start of the merge window, rebased if necessary on top of bug
> fixes, surely makes some sense?
>
> There were a few people in favour of tagging master for at least
> non-LTS releases. We're not in a position we could do that yet
> anyway, but there are some merits to considering this as we speed up
> our release cycles.
>
> If there's a technical issue around collaboration or interdependent
> PRs, then we do need to consider either a short-lived "next" branch,
> or short-lived specific feature branches. You can edit any PR to
> change the base branch if there's a requirement for this.
>
> If it's a social issue - ie. better communication, then maybe we
> should have been a bit clearer in promoting the changes in process the
> new release schedule entails. That's at least partly my fault. I
> need to better link in the agreed plan wherever we may need it,
> including the repo readme -
> https://cwiki.apache.org/confluence/display/NETBEANS/Release+Schedule
>
> Within that release schedule, anything merged to master at any point,
> within the merge window or not, is intended for the next scheduled
> release. And master should always be releaseable as far as that is
> possible.
>
> Best wishes,
>
> Neil
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
> For additional commands, e-mail: dev-help@netbeans.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
>
>
Re: NB11.1 Feature Freeze - master branch closed except for fixes!
Posted by Neil C Smith <ne...@apache.org>.
On Tue, 18 Jun 2019 at 00:18, Junichi Yamamoto <ju...@gmail.com> wrote:
>
> Let's just revert it.
OK. Just replied on the PR. Revert button has disappeared, but feel
free to revert, or I will later - first priority is first beta build.
> I think we need the new branch for merging PRs unrelated to NB 11.1
> because the current PRs are set 'master' as the base branch.
> The same thing may happen again.
May I ask why? To solve a technical issue or a social issue?
IMO all PRs still need to be against master in general, or we lose all
the benefits of doing this. We're only talking about closing the
merge window for a few weeks every few months. Merging pending PRs at
the start of the merge window, rebased if necessary on top of bug
fixes, surely makes some sense?
There were a few people in favour of tagging master for at least
non-LTS releases. We're not in a position we could do that yet
anyway, but there are some merits to considering this as we speed up
our release cycles.
If there's a technical issue around collaboration or interdependent
PRs, then we do need to consider either a short-lived "next" branch,
or short-lived specific feature branches. You can edit any PR to
change the base branch if there's a requirement for this.
If it's a social issue - ie. better communication, then maybe we
should have been a bit clearer in promoting the changes in process the
new release schedule entails. That's at least partly my fault. I
need to better link in the agreed plan wherever we may need it,
including the repo readme -
https://cwiki.apache.org/confluence/display/NETBEANS/Release+Schedule
Within that release schedule, anything merged to master at any point,
within the merge window or not, is intended for the next scheduled
release. And master should always be releaseable as far as that is
possible.
Best wishes,
Neil
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: NB11.1 Feature Freeze - master branch closed except for fixes!
Posted by Junichi Yamamoto <ju...@gmail.com>.
Let's just revert it.
I think we need the new branch for merging PRs unrelated to NB 11.1
because the current PRs are set 'master' as the base branch.
The same thing may happen again.
Thanks,
Junichi
On Tue, Jun 18, 2019 at 4:07 AM Neil C Smith <ne...@apache.org> wrote:
>
> On Mon, 17 Jun 2019 at 19:37, Geertjan Wielenga <ge...@apache.org> wrote:
> >
> > So where should that PR 1301 go, i.e., I guess, it should not be merged at
> > all unless it should go into 11.1?
>
> Ideally, no, particularly because it's intended for 11.2 anyway. In
> general, it depends where the urge to merge comes from. If a PR is
> fairly standalone, then we tag it with NB11.2 and merge when the
> window reopens after the release, after the spec version update and on
> top of any bug fixes.
>
> OTOH, as Jan, I and others discussed here, there might be a need to
> consider a short-lived "next" branch (or in my opinion various feature
> grouped branches) to allow for collaboration while master is closed.
> We agreed to review after NB 11.1 release, and during if it poses a
> problem earlier.
>
> In respect of PR 1301 need to consider whether to revert the commit
> and reapply later, or whether the code is OK to remain in place.
> Either way, it won't be in first beta now.
>
> Best wishes,
>
> Neil
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
> For additional commands, e-mail: dev-help@netbeans.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: NB11.1 Feature Freeze - master branch closed except for fixes!
Posted by Neil C Smith <ne...@apache.org>.
On Mon, 17 Jun 2019 at 19:37, Geertjan Wielenga <ge...@apache.org> wrote:
>
> So where should that PR 1301 go, i.e., I guess, it should not be merged at
> all unless it should go into 11.1?
Ideally, no, particularly because it's intended for 11.2 anyway. In
general, it depends where the urge to merge comes from. If a PR is
fairly standalone, then we tag it with NB11.2 and merge when the
window reopens after the release, after the spec version update and on
top of any bug fixes.
OTOH, as Jan, I and others discussed here, there might be a need to
consider a short-lived "next" branch (or in my opinion various feature
grouped branches) to allow for collaboration while master is closed.
We agreed to review after NB 11.1 release, and during if it poses a
problem earlier.
In respect of PR 1301 need to consider whether to revert the commit
and reapply later, or whether the code is OK to remain in place.
Either way, it won't be in first beta now.
Best wishes,
Neil
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: NB11.1 Feature Freeze - master branch closed except for fixes!
Posted by Geertjan Wielenga <ge...@apache.org>.
So where should that PR 1301 go, i.e., I guess, it should not be merged at
all unless it should go into 11.1?
Gj
On Mon, 17 Jun 2019 at 18:41, Neil C Smith <ne...@apache.org> wrote:
> Hi All,
>
> Just a reminder that the feature freeze deadline for NB 11.1 was on
> Saturday. The release branch was made earlier today, and the branding
> / config changes made - first beta should be ready tomorrow.
>
> The only merges to master between now and release date should be
> intended for NB11.1 (everything will be merged across) and ideally
> with a JIRA ticket and taking into consideration NetBeans bug priority
> guidelines
> https://cwiki.apache.org/confluence/display/NETBEANS/Bug+Priority+Guidelines
>
> Please tag any PR intended to be merged with NB 11.1 - I'll keep an
> eye out for them!
>
> This email is prompted partly by
> https://github.com/apache/netbeans/pull/1301 :-)
>
> Thanks and best wishes,
>
> Neil
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
> For additional commands, e-mail: dev-help@netbeans.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
>
>