Bug 19963 - "$OpenBSD$" markers display in PrettyPatch, but not built-in "diff"
Summary: "$OpenBSD$" markers display in PrettyPatch, but not built-in "diff"
Status: RESOLVED DUPLICATE of bug 29317
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 525.x (Safari 3.1)
Hardware: All All
: P2 Normal
Assignee: Nobody
URL: https://bugs.webkit.org/attachment.cg...
Keywords:
Depends on:
Blocks:
 
Reported: 2008-07-09 11:17 PDT by David Kilzer (:ddkilzer)
Modified: 2011-03-15 10:51 PDT (History)
2 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description David Kilzer (:ddkilzer) 2008-07-09 11:17:17 PDT 
* 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.)
Comment 1 David Kilzer (:ddkilzer) 2008-07-10 15:07:54 PDT 
Another example:

https://bugs.webkit.org/attachment.cgi?id=22203&action=prettypatch
Comment 2 Caio Marcelo de Oliveira Filho 2011-03-08 17:50:26 PST 
David Kilzer, I think my patch for bug 29317 will solve this problem as well.
Comment 3 Caio Marcelo de Oliveira Filho 2011-03-10 20:17:32 PST 
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 ***
Comment 4 David Kilzer (:ddkilzer) 2011-03-15 10:51:11 PDT 
(In reply to comment #2)
> David Kilzer, I think my patch for bug 29317 will solve this problem as well.

Looks good.  Thanks!