Bug 36151

Summary: webkit-patch rollout should error out on conflicts
Product: WebKit Reporter: Adam Barth <abarth>
Component: New BugsAssignee: Nobody <webkit-unassigned>
Status: RESOLVED FIXED    
Severity: Normal CC: eric, evan
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Other   
OS: OS X 10.5   
Attachments:
Description Flags
Patch eric: review+

Adam Barth
Reported 2010-03-15 20:52:51 PDT
webkit-patch rollout should error out on conflicts
Attachments
Patch (3.27 KB, patch)
2010-03-15 20:54 PDT, Adam Barth 		eric: review+
DetailsFormatted DiffDiff
View All Add attachment proposed patch, testcase, etc.
Adam Barth
Comment 1 2010-03-15 20:54:13 PDT
Created attachment 50757 [details] Patch
Eric Seidel (no email)
Comment 2 2010-03-15 21:13:31 PDT
Comment on attachment 50757 [details] Patch Sad about copy/paste, but looks good.
Eric Seidel (no email)
Comment 3 2010-03-15 21:13:43 PDT
Comment on attachment 50757 [details] Patch Where's the testing?
Adam Barth
Comment 4 2010-03-15 21:15:27 PDT
Committed r56032: <http://trac.webkit.org/changeset/56032>
Note You need to log in before you can comment on or make changes to this bug.