Re: release process with git

On Sun, 2012-04-08 at 23:54 -0700, Stas Malyshev wrote: > Hi! > > 5.4.1 will be the first release we're releasing using our new git setup. As will 5.3.11. > I would like to refine a process that we used to have for releases and > make small tweaks hopefully to allow us more predictable release > schedule and faster releases. > What I am proposing is the following: [...] For 5.3.11+ my base assumption is that every bug in there exists for a few years already (we don't add new features or such, do we? ;-) ). Going from there I agree that fixes made during the release cycle can easily wait for the next release. So the approach is fine. For 5.3.11RC2 I'm currently looking at merging (cherry-picking) 0f180a6 - Fixed bug in new stream_get_line() when using NUL as a delimiter. (This is a regression from 5.3.10) 9bf8cd4 - Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2)) (Crash fix) ca58cd0 - Cherry-pick 4cc74767 Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and forbid \0. See bug #60227. (Security related) 55a6f3a - - update to openssl 0.9.8u (Readme change for Win distribution, no code change) 0e53ac4 - - Updated to version 2012.3 (2012c) (current timezone data) 8449e0c - Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less) (compilation issue) johannes