On May 26, 2013 1:15 PM, "Brett Cannon" <brett@python.org> wrote:
>
>
> On May 25, 2013 9:18 PM, "Nick Coghlan" <ncoghlan@gmail.com> wrote:
> >
> > On Sun, May 26, 2013 at 9:41 AM, Brett Cannon <brett@python.org> wrote:
> > >> The NEWS update script could even use the revision history to decide
> > >> which order to add entries to the bulleted list.
> > >
> > > I think the annoyance with this approach is you will have to remember
> > > to add a file every time you do anything worthy of NEWS. Without
> > > something like ``hg newsworthy`` to take an optional issue # and then
> > > have you enter your NEWS entry and then use that to pre-populate the
> > > commit message, people will forget. Now granted adding the commit
> > > later is not a huge deal, but it is something that might happen if you
> > > forget to ``hg st`` before committing.
> >
> > How is that any different from the status quo with people forgetting
> > an entry in NEWS? Just the extra step of needing to "hg add" the news
> > entry?
>
> I didn't think there was a forgetfulness issue. I'm just trying to lower the overhead of doing a merge.
>
> >
> > Well, perhaps we can do this in two phases - resolve the persistent
> > problem of merge conflicts first, and then worry about the separate
> > push race problem later.
>
> If we can ever agree on a solution. :)

If people are still allowed to edit Misc/NEWS manually while a tools and alternatives are worked out that ultimately merge their entries into the original file at release time I think no agreement is needed beyond from the release managers who presumably get to ensure it all happens to generate the single file at tag/branch time.

Try a few things out, see what sticks and vote on what the ultimate solution for everyone should be at that point.

>
> -brett
>
> >
> > Cheers,
> > Nick.
> >
> > --
> > Nick Coghlan   |   ncoghlan@gmail.com   |   Brisbane, Australia