In article <4df50623.4020...@netwok.org>, Éric Araujo <mer...@netwok.org> wrote: > Le 12/06/2011 20:01, Benjamin Peterson a écrit : > > Another method would be to write a extension for Mercurial which is > > "smart" about the format of Misc/NEWS and could do the resolution > > automatically. > Even easier than an extension: a merge tool, i.e. a script that knows > how to parse the file and compare three versions of it.
Of course a merge tool helps. But merge conflicts do add to the complexity of the process for many people and the current NEWS update policy pretty much ensures there will be conflicts even when the code changes do not cause any conflicts. Why not lower the barrier? Another, more complicated way would be to use a hook to store each commit message as a separate file in a Misc/NEWS.d directory. Then the separate files could be periodically rolled up into the singe NEWS file. That would allow for post-push editing by the committer. -- Ned Deily, n...@acm.org _______________________________________________ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
