newton:trunk dickinsm$ svn info Path: . URL: svn+ssh://pythondev@svn.python.org/python/trunk Repository Root: svn+ssh://pythondev@svn.python.org Repository UUID: 6015fed2-1504-0410-9fe1-9d1591cc4771 Revision: 74331 Node Kind: directory Schedule: normal Last Changed Author: georg.brandl Last Changed Rev: 74328 Last Changed Date: 2009-08-06 16:06:25 +0100 (Thu, 06 Aug 2009) newton:trunk dickinsm$ svn --no-ignore st newton:trunk dickinsm$ patch -p1 <../backport_dict_and_set_comprehension.diff patching file Doc/reference/expressions.rst patching file Grammar/Grammar Hunk #1 FAILED at 112. Hunk #2 FAILED at 127. Hunk #3 succeeded at 135 (offset -2 lines). 2 out of 3 hunks FAILED -- saving rejects to file Grammar/Grammar.rej patching file Include/Python-ast.h Hunk #1 FAILED at 186. Hunk #2 succeeded at 233 (offset -4 lines). Hunk #3 succeeded at 463 (offset -6 lines). 1 out of 3 hunks FAILED -- saving rejects to file Include/Python-ast.h.rej patching file Include/graminit.h Hunk #2 FAILED at 80. 1 out of 2 hunks FAILED -- saving rejects to file Include/graminit.h.rej patching file Include/opcode.h Hunk #1 succeeded at 146 (offset -1 lines). patching file Include/symtable.h patching file Lib/compiler/ast.py patching file Lib/compiler/pyassem.py patching file Lib/compiler/pycodegen.py patching file Lib/compiler/transformer.py Hunk #3 FAILED at 1101. Hunk #4 succeeded at 1273 (offset -8 lines). Hunk #5 succeeded at 1285 (offset -8 lines). 1 out of 5 hunks FAILED -- saving rejects to file Lib/compiler/transformer.py.rej patching file Lib/opcode.py patching file Lib/symbol.py Hunk #2 FAILED at 90. 1 out of 2 hunks FAILED -- saving rejects to file Lib/symbol.py.rej patching file Lib/test/test_compiler.py Hunk #2 FAILED at 278. 1 out of 2 hunks FAILED -- saving rejects to file Lib/test/test_compiler.py.rej patching file Lib/test/test_dictcomps.py patching file Lib/test/test_grammar.py Hunk #1 succeeded at 803 (offset -5 lines). patching file Lib/test/test_parser.py Hunk #1 succeeded at 63 (offset -13 lines). Hunk #2 succeeded at 105 (offset -13 lines). patching file Lib/test/test_setcomps.py patching file Modules/parsermodule.c Hunk #1 succeeded at 938 with fuzz 1. Hunk #11 FAILED at 2965. Hunk #12 succeeded at 2997 with fuzz 2 (offset 6 lines). Hunk #13 FAILED at 3037. 2 out of 13 hunks FAILED -- saving rejects to file Modules/parsermodule.c.rej patching file Parser/Python.asdl Hunk #1 succeeded at 57 with fuzz 2 (offset -1 lines). patching file Python/Python-ast.c Hunk #1 succeeded at 193 (offset -4 lines). Hunk #2 succeeded at 731 with fuzz 1 (offset -6 lines). Hunk #3 succeeded at 1626 (offset -20 lines). Hunk #4 succeeded at 2644 (offset -29 lines). Hunk #5 succeeded at 4868 (offset -61 lines). Hunk #6 succeeded at 6205 with fuzz 1 (offset -62 lines). patching file Python/ast.c Hunk #10 FAILED at 1426. Hunk #11 FAILED at 1452. Hunk #12 succeeded at 1942 (offset -23 lines). Hunk #13 succeeded at 1960 (offset -23 lines). Hunk #14 succeeded at 2005 (offset -23 lines). Hunk #15 succeeded at 2075 (offset -23 lines). Hunk #16 succeeded at 2100 (offset -23 lines). 2 out of 16 hunks FAILED -- saving rejects to file Python/ast.c.rej patching file Python/ceval.c Hunk #2 succeeded at 2193 (offset -19 lines). patching file Python/compile.c Hunk #3 succeeded at 2654 (offset -1 lines). Hunk #4 succeeded at 2699 (offset -1 lines). Hunk #5 succeeded at 3010 (offset -6 lines). patching file Python/graminit.c Hunk #1 FAILED at 1550. Hunk #2 succeeded at 1939 (offset -40 lines). Hunk #3 FAILED at 1957. Hunk #4 FAILED at 1971. 3 out of 4 hunks FAILED -- saving rejects to file Python/graminit.c.rej patching file Python/import.c Hunk #1 FAILED at 76. 1 out of 1 hunk FAILED -- saving rejects to file Python/import.c.rej patching file Python/symtable.c Hunk #3 succeeded at 1223 (offset -3 lines). Hunk #4 succeeded at 1471 (offset -3 lines).