WebKit Bugzilla
New
Browse
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
RESOLVED FIXED
27168
With Subversion 1.6, update-webkit prompts on conflicts
https://bugs.webkit.org/show_bug.cgi?id=27168
Summary
With Subversion 1.6, update-webkit prompts on conflicts
mitz
Reported
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.
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 attachment
proposed patch, testcase, etc.
Mark Rowe (bdash)
Comment 1
2009-07-10 18:12:31 PDT
I think the option in question is "--accept postpone"
David Kilzer (:ddkilzer)
Comment 2
2009-09-01 17:59:28 PDT
Created
attachment 38904
[details]
Clean up VCSUtils.pm
David Kilzer (:ddkilzer)
Comment 3
2009-09-01 17:59:32 PDT
Created
attachment 38905
[details]
Moved svn 1.6 version check into VCSUtils::isSVNVersion16OrNewer()
David Kilzer (:ddkilzer)
Comment 4
2009-09-01 17:59:35 PDT
Created
attachment 38906
[details]
With Subversion 1.6, update-webkit prompts on conflicts
Eric Seidel (no email)
Comment 5
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).
Eric Seidel (no email)
Comment 6
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.
Eric Seidel (no email)
Comment 7
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.
David Kilzer (:ddkilzer)
Comment 8
2009-09-02 08:25:45 PDT
Committed rr47969: <
http://trac.webkit.org/changeset/r47969
>
David Kilzer (:ddkilzer)
Comment 9
2009-09-02 08:25:55 PDT
Committed rr47970: <
http://trac.webkit.org/changeset/r47970
>
David Kilzer (:ddkilzer)
Comment 10
2009-09-02 08:26:19 PDT
Committed rr47971: <
http://trac.webkit.org/changeset/r47971
>
David Kilzer (:ddkilzer)
Comment 11
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
>
Note
You need to
log in
before you can comment on or make changes to this bug.
Top of Page
Format For Printing
XML
Clone This Bug