I am sure folks are aware but GitHub supports “protected branches” that
outright disable force pushes. Extremely useful feature :) Looking in
github it looks like it was used in the past: master, and branches 2.5.x -
2.8.x are protected but no others are. Probably a useful thing to add to
the process when creating a new maintenance branch would be to go into
GitHub and add that branch as a protected one. It looks like it is possible
to do it via the GitHub api as well, so also possible to add to the release
scripts as well.
$0.02
On October 27, 2017 at 7:18:38 PM, Ben Caradoc-Davies (b...@transient.nz)
wrote:
Merged.
On 28/10/17 13:55, Ben Caradoc-Davies wrote:
> I have submitted a pull request:
> https://github.com/geoserver/geoserver/pull/2613
>
> This pull request contains:
>
> - The six substantive commits on my local 2.12.x branch (listed earlier)
>
> - Cherry-picked from master (I *assume* this was a straightforward
> cherry-pick to backport to 2.12.x):
> 9dfdf50de9094d778302be467bf11c334485515f [GEOS-8353] Ensure KML
> validates without being online.
>
> I did *not* include:
>
> Commit 3f472c02b06a7d13851ee9e8523684ca7b752397 by Andrea Aime
> [GEOS-8360] xStream security warning
>
> because I think it has already been cherry-picked onto the new 2.12.x as
> https://github.com/geoserver/geoserver/pull/2613.
>
> This leaves only the changes listed in this Jenkins build:
> https://build.geoserver.org/view/geoserver/job/geoserver-2.12.x/37/changes
>
> Alessio, I do not know if you intended to remove these changes. Please
> re-apply them to 2.12.x if that was your intent.
>
> Kind regards,
>
--
Ben Caradoc-Davies <b...@transient.nz>
Director
Transient Software Limited <http://transient.nz/>
New Zealand
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Geoserver-devel mailing list
Geoserver-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Geoserver-devel mailing list
Geoserver-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel
