|
From: | pkx166h |
Subject: | Re: Patch series (available at branch dev/syntax) for more argument list power. (issue 5333051) |
Date: | Sat, 05 Nov 2011 11:56:14 +0000 |
Patch fails to apply against current master --snip-- address@hidden:~/lilypond-git$ patch -p1 < ../Desktop/issue5333051_6001.diff patching file Documentation/extending/programming-interface.itely patching file input/regression/optional-args-backup.ly Hunk #1 FAILED at 4. 1 out of 1 hunk FAILED -- saving rejects to file input/regression/optional-args-backup.ly.rej patching file lily/parser.yy Hunk #1 FAILED at 73. Hunk #2 succeeded at 128 with fuzz 2 (offset -18 lines). Hunk #3 succeeded at 154 (offset -18 lines). Hunk #4 succeeded at 170 (offset -18 lines). Hunk #5 FAILED at 328. Hunk #6 succeeded at 335 (offset -14 lines). Hunk #7 succeeded at 381 (offset -14 lines). Hunk #8 FAILED at 477. Hunk #9 succeeded at 465 (offset -20 lines). Hunk #10 succeeded at 501 (offset -20 lines). Hunk #11 succeeded at 651 (offset -20 lines). Hunk #12 FAILED at 1125. Hunk #13 FAILED at 1263. Hunk #14 FAILED at 1291. Hunk #15 succeeded at 1313 with fuzz 2 (offset -1 lines). Hunk #16 succeeded at 1356 with fuzz 2 (offset 2 lines). Hunk #17 succeeded at 1840 with fuzz 1 (offset 447 lines). Hunk #18 succeeded at 1912 with fuzz 1 (offset 454 lines). Hunk #19 FAILED at 1835. Hunk #20 FAILED at 2002. Hunk #21 succeeded at 1925 with fuzz 2 (offset -107 lines). Hunk #22 succeeded at 2525 (offset -74 lines). Hunk #23 succeeded at 2552 (offset -74 lines). 8 out of 23 hunks FAILED -- saving rejects to file lily/parser.yy.rej patching file scm/ly-syntax-constructors.scm Hunk #1 succeeded at 217 (offset 6 lines). James http://codereview.appspot.com/5333051/
[Prev in Thread] | Current Thread | [Next in Thread] |