[Webkit-unassigned] [Bug 33335] New: webkit-patch rollout should warn you about merge conflicts

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=33335

           Summary: webkit-patch rollout should warn you about merge
                    conflicts
           Product: WebKit
           Version: 528+ (Nightly build)
          Platform: PC
        OS/Version: Mac OS X 10.5
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
        AssignedTo: webkit-unassigned at lists.webkit.org
        ReportedBy: eric at webkit.org
                CC: abarth at webkit.org


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.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.