19963 2008-07-09 11:17:17 -0700 "$OpenBSD$" markers display in PrettyPatch, but not built-in "diff" 2011-03-15 10:51:11 -0700 1 1 1 Unclassified WebKit Tools / Tests 525.x (Safari 3.1) All All RESOLVED DUPLICATE 29317 https://bugs.webkit.org/attachment.cgi?id=22185&action=prettypatch P2 Normal --- 1 ddkilzer webkit-unassigned aroben cmarcelo oldest_to_newest 85550 0 ddkilzer 2008-07-09 11:17:17 -0700 * SUMMARY An OpenBSD patch on Bug 19775 uses "$OpenBSD$" as a marker between file diffs. The built-in "diff" format on bugs.webkit.org does not display these lines: https://bugs.webkit.org/attachment.cgi?id=22185&action=diff However, PrettyPatch does display them (after skipping the first) at the end of each diff: https://bugs.webkit.org/attachment.cgi?id=22185&action=prettypatch I think counting the number of actual/expected lines in the patch while parsing out individual diffs may fix the issue. (Would be interesting to look at how the "diff" format does its parsing, too.) 85668 1 ddkilzer 2008-07-10 15:07:54 -0700 Another example: https://bugs.webkit.org/attachment.cgi?id=22203&action=prettypatch 364264 2 cmarcelo 2011-03-08 17:50:26 -0800 David Kilzer, I think my patch for bug 29317 will solve this problem as well. 365787 3 cmarcelo 2011-03-10 20:17:32 -0800 This is fixed now. I'm marking as duplicate of bug 29317 because it is fundamentally the same problem: displaying lines that are not part of the actual diff contents. *** This bug has been marked as a duplicate of bug 29317 *** 367770 4 ddkilzer 2011-03-15 10:51:11 -0700 (In reply to comment #2) > David Kilzer, I think my patch for bug 29317 will solve this problem as well. Looks good. Thanks!