Re: [core-workflow] the Misc/NEWS problem

2015-08-07 Thread Brett Cannon
On Thu, Aug 6, 2015 at 7:17 PM Nick Coghlan wrote: > On 7 August 2015 at 05:46, R. David Murray wrote: > > On Thu, 06 Aug 2015 18:16:53 -, Brett Cannon > wrote: > >> > However, having a commit log based generator offers a relatively > >> > decent way to deal with that: a Misc/NEWS.overrides

Re: [core-workflow] the Misc/NEWS problem

2015-08-07 Thread Nick Coghlan
On 8 August 2015 at 08:25, Brett Cannon wrote: > On Thu, Aug 6, 2015 at 7:17 PM Nick Coghlan wrote: >> In the Roundup+Mercurial case, I think we can deal with this more >> comprehensively by actually storing our canonical issue->commit >> reference in *Roundup*, and mentioning an issue number in

Re: [core-workflow] the Misc/NEWS problem

2015-08-07 Thread Pierre-Yves David
On 08/05/2015 10:30 PM, Brett Cannon wrote: If we ever want to have a nice workflow where we can automate as much as possible, we need to figure out a way deal with our most common merge conflict: Misc/NEWS. Thanks to shifts in the format between different minor versions the file is pretty much