Well our branching model for release so far is branch, do cherry picks from master if needed, do addition ~14 changes required only for release. It was never palnned to merge back to master. Of course, this strategy is up to the release manager and the community.

On 4/27/19 8:08 PM, Wade Chandler wrote:
On Sat, Apr 27, 2019, 14:22 Laszlo Kishalmi <laszlo.kisha...@gmail.com>
wrote:

On 4/27/19 1:12 AM, Jan Lahoda wrote:
Hi Laszlo,

On Sat, Apr 27, 2019 at 7:57 AM Laszlo Kishalmi <
laszlo.kisha...@gmail.com>
wrote:

Dear all,

As Gradle was a new out-of-the box feature, I've received some
issues/feedback. I've already fixed some of them.

I would like to do a release of those changes. Those fixes might be not
that important, but what I'm really curious, that actually can we, and
how can we roll out such a partial patch release?

I think it would be awesome if we could do update releases!


My plan is the following:

   1. Branch the current release into something like:
      release110-gradle-patch-1

I'd suggest to simply continue with the release110 patch. (The last
release
is tagged anyway, so we are not loosing that, and in a longer term, it
would IMO be easier to simply  continue in the release branch with all
the
changes.)
Well right now release110 branch has already some changes which shall go
into the 11.1 release

(Just a reminder for us, maybe the release branch shall be named to
release12x if we plan to have a 12.1 in December)

Anyway, I'd keep this effort separated from 11.1, though I guess the new
branch would be just merged into the release110 after the Gradle Patch
release happens.

To me this points to a good reason for the release branches to only live
until the release at which point it is fully merged up with master and
deleted, then it is tagged. In prep for a dot release, a release branch is
created and cleaned up etc; rinse repeat. Then the tags release110 and
release111 would be static and not confusing like a release110 with changes
after the release.

Thanks

Wade


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@netbeans.apache.org
For additional commands, e-mail: dev-h...@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists



Reply via email to