Message159105
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? |
|
Date |
User |
Action |
Args |
2012-04-24 00:42:33 | belopolsky | set | recipients:
+ belopolsky, georg.brandl, r.david.murray, lavajoe |
2012-04-24 00:42:33 | belopolsky | set | messageid: <1335228153.78.0.882148018063.issue10941@psf.upfronthosting.co.za> |
2012-04-24 00:42:33 | belopolsky | link | issue10941 messages |
2012-04-24 00:42:33 | belopolsky | create | |
|