On Thu, Nov 10, 2011 at 8:32 AM, Antoine Pitrou <solip...@pitrou.net> wrote: > FYI, Twisted has chosen a totally different approach: > http://twistedmatrix.com/trac/wiki/ReviewProcess#Newsfiles > > “[...] If we just let each author add to the NEWS files on every > commit, though, we would run into lots of spurious conflicts. To avoid > this, we have come up with a scheme involving separate files for each > change. > > Changes must be accompanied by an entry in at least one topfiles > directory. [...] > An entry must be a file named <ticket number>.<change type>. You should > replace <ticket number> with the ticket number which is being resolved > by the change (if multiple tickets are resolved, multiple files with > the same contents should be added)”
An approach like that would also have the virtue of avoiding conflicts if you set up a NEWS file change in a feature branch that ends up being in use for longer than you originally thought. Cheers, Nick. -- Nick Coghlan | ncogh...@gmail.com | Brisbane, Australia _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
