Ezio Melotti added the comment: One of the Mercurial devs convinced me to pursue what I had initially proposed in msg197645 and write a merge script (attached).
The script is still a proof of concept, it makes a few assumptions and doesn't handle all the cases, but I did a few tests and it seems to work for at least some cases. If people like it it can be improved. In short it parses Misc/NEWS, see what news entries have been added in the changeset(s) that it's being merged, and adds them at the top of the corresponding section. To enable it download the file, set it as executable (chmod +x newsmerge.py), and add the following to .hg/hgrc: [merge-tools] newsmerge.executable = /path/to/newsmerge.py newsmerge.priority = 100 newsmerge.premerge = True newsmerge.args = $base $local $other -o $output [merge-patterns] Misc/NEWS = newsmerge This will kick in only if the regular merge results in a conflict (so if you don't see any of the debug output from newsmerge it means that mercurial managed to merge Misc/NEWS on its own without conflicts). ---------- Added file: http://bugs.python.org/file35011/newsmerge.py _______________________________________ Python tracker <rep...@bugs.python.org> <http://bugs.python.org/issue18967> _______________________________________ _______________________________________________ Python-bugs-list mailing list Unsubscribe: https://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
