Re: Adding NEWS entries to each active stable release branch (was: NEWS handling)
On Tue, Oct 15, 2013 at 2:54 PM, Michael Wallner <[email protected]> wrote:
> Just to be sure everybody has a chance to read and comment:
>
> On 9 October 2013 09:07, Michael Wallner <[email protected]> wrote:
> >> Thanks for your feedback! I fixed NEWS for the upcoming releases.
> >> Please let us have an eye on it in the future!
> >
> > Okay -- looking at NEWS.GIT-RULES it actually says the opposite:
> >
> > 2. All news updates intended for public viewing, such as new features,
> > bug fixes, improvements, etc., should go into the NEWS file of the
> > *first* to be released version with the given change. In other
> words
> > any NEWS file change only needs to done in one branch.
> >
> > How about changing it to:
> >
> > 2. All news updates intended for public viewing, such as new features,
> > bug fixes, improvements, etc., should go into the NEWS file of *any
> > stable release* version with the given change. In other words,
> > news about a bug fix which went into PHP-5.4, PHP-5.5 and master
> > should be noted in both PHP-5.4/NEWS and PHP-5.5/NEWS but
> > not master, which is not a public released version yet.
> >
> > PS: I post that for other people that had not time to notice this
> > discussion and I will most probably give a week or so for others to
> > speek up before changing any settled rules. Could well be there are
> > people who do not want to write two NEWS entries :)
>
Doing it like this seems more cumbersome. Currently merges use an "ours"
merge driver for NEWS etc, so NEWS changes are not merged upwards. You'd
have to manually copy them in. I think it's okay like it is right now,
assuming that the RMs copy the items from the 5.4 changelog into the one
for 5.5 when releasing (which iirc they do).
Nikita
Thread (8 messages)