Bug 27168 - With Subversion 1.6, update-webkit prompts on conflicts
Summary: With Subversion 1.6, update-webkit prompts on conflicts
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: All OS X 10.5
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-07-10 18:03 PDT by mitz
Modified: 2009-09-02 08:27 PDT (History)
2 users (show)

See Also:

Attachments
Clean up VCSUtils.pm (2.41 KB, patch)
2009-09-01 17:59 PDT, David Kilzer (:ddkilzer) 		eric: review+
eric: commit-queue-
Details | Formatted Diff | Diff
Moved svn 1.6 version check into VCSUtils::isSVNVersion16OrNewer() (4.05 KB, patch)
2009-09-01 17:59 PDT, David Kilzer (:ddkilzer) 		eric: review+
eric: commit-queue-
Details | Formatted Diff | Diff
With Subversion 1.6, update-webkit prompts on conflicts (1.49 KB, patch)
2009-09-01 17:59 PDT, David Kilzer (:ddkilzer) 		eric: review+
eric: commit-queue-
Details | Formatted Diff | Diff
View All 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 mitz 2009-07-10 18:03:15 PDT 
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.
Comment 1 Mark Rowe (bdash) 2009-07-10 18:12:31 PDT 
I think the option in question is "--accept postpone"
Comment 2 David Kilzer (:ddkilzer) 2009-09-01 17:59:28 PDT 
Created attachment 38904 [details]
Clean up VCSUtils.pm
Comment 3 David Kilzer (:ddkilzer) 2009-09-01 17:59:32 PDT 
Created attachment 38905 [details]
Moved svn 1.6 version check into VCSUtils::isSVNVersion16OrNewer()
Comment 4 David Kilzer (:ddkilzer) 2009-09-01 17:59:35 PDT 
Created attachment 38906 [details]
With Subversion 1.6, update-webkit prompts on conflicts
Comment 5 Eric Seidel (no email) 2009-09-02 00:17:40 PDT 
Comment on attachment 38904 [details]
Clean up VCSUtils.pm

Looks sane. :)  I dream of the day when this and scm.py are one. :)  This ChangeLog patch will probably confuse our tools, so cq- (that, and you're a committer).
Comment 6 Eric Seidel (no email) 2009-09-02 00:20:02 PDT 
Comment on attachment 38905 [details]
Moved svn 1.6 version check into VCSUtils::isSVNVersion16OrNewer()

LGTM!  cq- for changlog confusion and that your'e a committer.
Comment 7 Eric Seidel (no email) 2009-09-02 00:21:45 PDT 
Comment on attachment 38906 [details]
With Subversion 1.6, update-webkit prompts on conflicts

Seems a comment in the script would be useful.  This looks good though.
Comment 8 David Kilzer (:ddkilzer) 2009-09-02 08:25:45 PDT 
Committed rr47969: <http://trac.webkit.org/changeset/r47969>
Comment 9 David Kilzer (:ddkilzer) 2009-09-02 08:25:55 PDT 
Committed rr47970: <http://trac.webkit.org/changeset/r47970>
Comment 10 David Kilzer (:ddkilzer) 2009-09-02 08:26:19 PDT 
Committed rr47971: <http://trac.webkit.org/changeset/r47971>
Comment 11 David Kilzer (:ddkilzer) 2009-09-02 08:27:58 PDT 
Oops...bug in bugzilla-tool mark-fixed:

Committed r47969: <http://trac.webkit.org/changeset/47969>
Committed r47970: <http://trac.webkit.org/changeset/47970>
Committed r47971: <http://trac.webkit.org/changeset/47971>