[Python-checkins] CANNOT Patch 3.x NEWS [was cpython (2.7): Issue #14707: add news entry\

[Terry Reedy]

This should be issue 17047

On 3/12/2013 2:14 AM, Terry Reedy wrote:
> On 3/12/2013 1:50 AM, terry.reedy wrote:
>> http://hg.python.org/cpython/rev/c162e2ff15bd
>> changeset:   82624:c162e2ff15bd
>> branch:      2.7
>> parent:      82617:cd0191a9b5c9
>> user:        Terry Jan Reedy <tjreedy at udel.edu>
>> date:        Tue Mar 12 01:26:28 2013 -0400
>> summary:
>>    Issue #14707: add news entry
>>
>> files:
>>    Misc/NEWS |  3 +++
>>    1 files changed, 3 insertions(+), 0 deletions(-)
>>
>>
>> diff --git a/Misc/NEWS b/Misc/NEWS
>> --- a/Misc/NEWS
>> +++ b/Misc/NEWS
>> @@ -944,6 +944,9 @@
>>   Documentation
>>   -------------
>>
>> +- Issue #14707: remove doubled words in docs and docstrings
>> +  reported by Serhiy Storchaka and Matthew Barnett.
>> +
>>   - Issue #16406: combine the pages for uploading and registering to
>> PyPI.
>>
>>   - Issue #16403: Document how distutils uses the maintainer field in
>
> The above was easy. When I tried to transplant this patch to 3.2, export
> and import, or directly edit 3.2 NEWS with Notepad++ or IDLE, hg makes a
> 319kb patch that deletes and add the entire file in chunks. I did not
> think I should commit and push that.
>
> The failure of transplant and import are perhaps understandable because
> 3.2 has a gratuitous case difference with /combine/Combine/.
>
> - Issue #16406: Combine the pages for uploading and registering to PyPI.
>
> But the inability to make a proper diff from direct edit is something
> else. If I add just a single blank line, even that generates a mega
> patch. Same with 3.3 NEWS. I also tried deleting the file to make hg
> regenerate from the repository database.
>
> Anyone have any idea what the problem is? Has anything changed with hg,
> windows, line endings and this text file in the last few months? I just
> pushed patches for about 20 scattered files in Docs, Lib, Modules, and
> Tools earlier today, so the problem seems to be specific to NEWS.
>
> tjr
>
> _______________________________________________
> Python-checkins mailing list
> Python-checkins at python.org
> http://mail.python.org/mailman/listinfo/python-checkins