Alexander Belopolsky <alexander.belopol...@gmail.com> added the comment:
I still get conflicts: $ patch -p0 < imaplib_Internaldate2tuple_dst_fix_python32.patch patching file Lib/imaplib.py Hunk #2 FAILED at 1312. Hunk #3 succeeded at 1347 (offset 8 lines). Hunk #4 FAILED at 1379. 2 out of 4 hunks FAILED -- saving rejects to file Lib/imaplib.py.rej patching file Lib/test/test_imaplib.py Hunk #1 FAILED at 24. 1 out of 1 hunk FAILED -- saving rejects to file Lib/test/test_imaplib.py.rej Are you sure your patch is against the head of the hg repository? ---------- _______________________________________ Python tracker <rep...@bugs.python.org> <http://bugs.python.org/issue10941> _______________________________________ _______________________________________________ Python-bugs-list mailing list Unsubscribe: http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
