➜

This issue tracker has been migrated to GitHub, and is currently read-only.
For more information, see the GitHub FAQs in the Python's Developer Guide.

Author terry.reedy
Recipients brett.cannon, dstufft, ezio.melotti, georg.brandl, lemburg, ncoghlan, pitrou, r.david.murray, sbt, terry.reedy, tshepang, zach.ware
Date 2014-12-02.23:06:55
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <1417561615.75.0.359564215765.issue18967@psf.upfronthosting.co.za>
In-reply-to
Content 
Thanks for the reminder/suggestion.  Re-reading Ezio's two patches (newsmerge.py and .hg/hgrc additions in msg217079), they appear to jointly automate what I now do by hand (revert to local and dump merge artifacts, replace with edited file with new entries pasted in, and mark as resolved) .  I also checked that the current Windows installers make .py files executable, so hg should be able to run newsmerge on Windows.  I have downloaded the file and made the additions to my 3.5 hgrc to test next time I have a news entry.
History
Date User Action Args
2014-12-02 23:06:55terry.reedysetrecipients: + terry.reedy, lemburg, brett.cannon, georg.brandl, ncoghlan, pitrou, ezio.melotti, r.david.murray, tshepang, sbt, zach.ware, dstufft
2014-12-02 23:06:55terry.reedysetmessageid: <1417561615.75.0.359564215765.issue18967@psf.upfronthosting.co.za>
2014-12-02 23:06:55terry.reedylinkissue18967 messages
2014-12-02 23:06:55terry.reedycreate