Bug 33335 - webkit-patch rollout should warn you about merge conflicts
Summary: webkit-patch rollout should warn you about merge conflicts
Status: NEW
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC OS X 10.5
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-01-07 12:14 PST by Eric Seidel (no email)
Modified: 2010-01-07 12:14 PST (History)
1 user (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 Eric Seidel (no email) 2010-01-07 12:14:30 PST 
webkit-patch rollout should warn you about merge conflicts

This caused Adam trouble today:
http://trac.webkit.org/changeset/52937

Right now it ignores them, because they always happen for ChangeLogs:
http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/scm.py#L439

We need better detection of which ones we should ignore.

This blocks removing --complete-rollout I think.