[Webkit-unassigned] [Bug 27168] New: With Subversion 1.6, update-webkit prompts on conflicts

[bugzilla-daemon at webkit.org]

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

           Summary: With Subversion 1.6, update-webkit prompts on
                    conflicts
           Product: WebKit
           Version: 528+ (Nightly build)
          Platform: All
        OS/Version: Mac OS X 10.5
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
        AssignedTo: webkit-unassigned at lists.webkit.org
        ReportedBy: mitz at webkit.org
                CC: ddkilzer at webkit.org


With Subversion, 1.6, svn prompts on conflicts by default, so when running
update-webkit when there are conflicts (such as in ChangeLog files), the user
is prompted to deal with the conflicts (even though update-webkit can resolve
certain conflicts automatically). I think this can be changed by passing a
certain option to svn if the version is 1.6 or later.

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