Thomas Kluyver, on 2014年05月16日 08:56, wrote: > On 16 May 2014 01:17, "Eric Firing" <ef...@ha...> wrote: > > Maybe this problem could be reduced by having a directory for CHANGELOG > > chunks, one file per PR, with the PR number as the filename. Then at > > release time they could be concatenated, edited, appended to the real > > CHANGELOG, and deleted. > > We already do this in ipython for our 'whatsnew' document. We allow > arbitrary filenames rather than using PR numbers, and then we concatenate > everything from the directory periodically. You're welcome to copy our > script to do this. Yes, this has been working out quite nicely for us, and we started doing it for the very same reasons - to keep conflicts to a minimum while making it easier to keep track of everything that has gone in. Here's the direct link to our script: https://github.com/ipython/ipython/blob/master/tools/update_whatsnew.py -- _ / \ A* \^ - ,./ _.`\\ / \ / ,--.S \/ \ / `"~,_ \ \ __o ? _ \<,_ /:\ --(_)/-(_)----.../ | \ --------------.......J Paul Ivanov http://pirsquared.org