Bug 36151 - webkit-patch rollout should error out on conflicts
Summary: webkit-patch rollout should error out on conflicts
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Other OS X 10.5
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-03-15 20:52 PDT by Adam Barth
Modified: 2010-03-15 21:15 PDT (History)
2 users (show)

See Also:


Attachments
Patch (3.27 KB, patch)
2010-03-15 20:54 PDT, Adam Barth
eric: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Adam Barth 2010-03-15 20:52:51 PDT
webkit-patch rollout should error out on conflicts
Comment 1 Adam Barth 2010-03-15 20:54:13 PDT
Created attachment 50757 [details]
Patch
Comment 2 Eric Seidel (no email) 2010-03-15 21:13:31 PDT
Comment on attachment 50757 [details]
Patch

Sad about copy/paste, but looks good.
Comment 3 Eric Seidel (no email) 2010-03-15 21:13:43 PDT
Comment on attachment 50757 [details]
Patch

Where's the testing?
Comment 4 Adam Barth 2010-03-15 21:15:27 PDT
Committed r56032: <http://trac.webkit.org/changeset/56032>