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 eli.bendersky
Recipients docs@python, eli.bendersky, hheimbuerger, serhiy.storchaka, techtonik
Date 2013-03-09.14:12:34
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <1362838355.07.0.531022381041.issue11367@psf.upfronthosting.co.za>
In-reply-to
Content
Henrik, this patch fails to apply to 3.2

applying issue11367_branch32.patch
patching file Doc/library/xml.etree.elementtree.rst
Hunk #1 FAILED at 411
1 out of 1 hunks FAILED -- saving rejects to file Doc/library/xml.etree.elementtree.rst.rej
patching file Lib/xml/etree/ElementTree.py
Hunk #1 FAILED at 704
Hunk #2 FAILED at 725
Hunk #3 FAILED at 750
3 out of 3 hunks FAILED -- saving rejects to file Lib/xml/etree/ElementTree.py.rej
abort: patch failed to apply


I suspect this may be because of line endings. Are you generating the patches on a Windows machine? All patches to Python should be strictly in Unix format (LF for line ending, not CR LF). Can you configure your hg client and / or editor to do this?

I haven't touched Windows for some time but IIRC TortoiseHg does the right thing if your file is proper. In other words, perhaps it's the editor's fault. Your editor should not insert Windows line-endings into a Unix-y file (which Doc/library/xml.etree.elementtree.rst is).
History
Date User Action Args
2013-03-09 14:12:35eli.benderskysetrecipients: + eli.bendersky, techtonik, docs@python, serhiy.storchaka, hheimbuerger
2013-03-09 14:12:35eli.benderskysetmessageid: <1362838355.07.0.531022381041.issue11367@psf.upfronthosting.co.za>
2013-03-09 14:12:35eli.benderskylinkissue11367 messages
2013-03-09 14:12:34eli.benderskycreate