On Sat, Aug 8, 2015, 07:40 Nick Coghlan <ncoghlan@gmail.com> wrote:

On 8 August 2015 at 22:05, Ezio Melotti <ezio.melotti@gmail.com> wrote:
> On Sat, Aug 8, 2015 at 8:25 AM, Pierre-Yves David
> <pierre-yves.david@ens-lyon.org> wrote:
>> You have another solution (5) having a dedicated merge script for misc/NEWS
>> that knows how to parse the format and generate a good merge. It should not
>> be too complicated to achieve. I've successfully used such script for
>> similarish file in the past.
> A merge script is already attached to the aforementioned issue: see
> http://bugs.python.org/issue18967#msg217079 and
> http://bugs.python.org/file35032/newsmerge.py
> I think you were the one who convinced and helped me implementing it :)

Right, the merge script would be a good option if we were otherwise
happy with the checked-in NEWS file as the data entry format for user
facing messages. We aren't particularly happy with that though, so it
makes sense to tackle the larger problem. That said, the merge script
might still be a good tactical solution in the interim to alleviate
some of the current irritations in merging forward bug fixes.

In relation to the bugs.python.org based approach, it occurs to me
that we could move patch contributor acknowledgements for merged
patches there as well, so they can be more readily queried
programmatically than they are today.

One thing at a time, but yes. Once we have push button merges we can easily record who contributed the patch to make sure ACKS is always up-to-date.