WebKit roll 72985:72986

WebKit roll 72985:72986

72986 is a commit to a branch. please pick webkit revision that exist on the trunk

BUG=none
TEST=it's actually possible to check at the desired webkit revision.
TBR=ojan@google.com

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=67828

[jochen (gone - plz use gerrit), 2010-12-01 07:42:12]

actually it's 72986 -> 72985

[Z_DONOTUSE, 2010-12-01 15:54:45]

I didn't realize this was a problem. What breaks if we roll to a commit to a
branch?

On Tue, Nov 30, 2010 at 11:42 PM, <jochen@chromium.org> wrote:

> Reviewers: ojan1,
>
> Message:
> actually it's 72986 -> 72985
>
> Description:
> WebKit roll 72985:72986
>
> 72986 is a commit to a branch. please pick webkit revision that exist on
> the
> trunk
>
> BUG=none
> TEST=it's actually possible to check at the desired webkit revision.
> TBR=ojan@google.com
>
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=67828
>
> Please review this at http://codereview.chromium.org/5436001/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files:
>  M DEPS
>
>
> Index: DEPS
> diff --git a/DEPS b/DEPS
> index
>
d4d69816d7149b1c5e6ce1ce03b2a932f04335be..060284f2252365bbb8b9d56b67482f4614c3d1da
> 100644
> --- a/DEPS
> +++ b/DEPS
> @@ -4,7 +4,7 @@ vars = {
>   "googlecode_url": "http://%s.googlecode.com/svn",
>   "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
>   "nacl_trunk": "http://src.chromium.org/native_client/trunk",
> -  "webkit_revision": "72986",
> +  "webkit_revision": "72985",
>   "skia_revision": "626",
>   "chromium_git": "http://git.chromium.org/git",
>   "swig_revision": "40423",
>
>
>

[jochen (gone - plz use gerrit), 2010-12-01 15:56:50]

When you use tools/sync-webkit-git.py to maintain a git checkout of webkit in
your chromium checkout, the script has to guess what revision you actual want

[jochen (gone - plz use gerrit), 2010-12-01 15:57:13]

On 2010/12/01 15:56:50, jochen wrote:
> When you use tools/sync-webkit-git.py to maintain a git checkout of webkit in
> your chromium checkout, the script has to guess what revision you actual want

i.e. the git svn bridge only has git revisions for svn revisions on the trunk

[Z_DONOTUSE, 2010-12-01 16:05:24]

On Wed, Dec 1, 2010 at 7:57 AM, <jochen@chromium.org> wrote:

> On 2010/12/01 15:56:50, jochen wrote:
>
>> When you use tools/sync-webkit-git.py to maintain a git checkout of webkit
>> in
>> your chromium checkout, the script has to guess what revision you actual
>> want
>>
>
> i.e. the git svn bridge only has git revisions for svn revisions on the
> trunk


Ugh. That's annoying. This patch LGTM. I wonder if there's a way we can my
sync-webkit-git.py smarter. WebKit gardeners don't need yet another pitfall
to know to avoid. :)

[evanm, 2010-12-01 16:23:53]

I don't know what you are talking about.

On Wed, Dec 1, 2010 at 8:04 AM, Ojan Vafai <ojan@google.com> wrote:
> On Wed, Dec 1, 2010 at 7:57 AM, <jochen@chromium.org> wrote:
>>
>> On 2010/12/01 15:56:50, jochen wrote:
>>>
>>> When you use tools/sync-webkit-git.py to maintain a git checkout of
>>> webkit in
>>> your chromium checkout, the script has to guess what revision you actual
>>> want
>>
>> i.e. the git svn bridge only has git revisions for svn revisions on the
>> trunk
>
> Ugh. That's annoying. This patch LGTM. I wonder if there's a way we can my
> sync-webkit-git.py smarter. WebKit gardeners don't need yet another pitfall
> to know to avoid. :)

[jochen (gone - plz use gerrit), 2010-12-01 16:29:51]

well, when webkit is rolled to a rev that corresponds to a commit to a
(webkit) branch, sync-webkit-git.py complains and syncs to the next smaller
revision that corresponds to a commit to the webkit trunk (which is the
right thing to do, but getting a warning is annoying anyway).

So I guess there's not much we can do :)

On Wed, Dec 1, 2010 at 5:23 PM, Evan Martin <evanm@google.com> wrote:

> I don't know what you are talking about.
>
> On Wed, Dec 1, 2010 at 8:04 AM, Ojan Vafai <ojan@google.com> wrote:
> > On Wed, Dec 1, 2010 at 7:57 AM, <jochen@chromium.org> wrote:
> >>
> >> On 2010/12/01 15:56:50, jochen wrote:
> >>>
> >>> When you use tools/sync-webkit-git.py to maintain a git checkout of
> >>> webkit in
> >>> your chromium checkout, the script has to guess what revision you
> actual
> >>> want
> >>
> >> i.e. the git svn bridge only has git revisions for svn revisions on the
> >> trunk
> >
> > Ugh. That's annoying. This patch LGTM. I wonder if there's a way we can
> my
> > sync-webkit-git.py smarter. WebKit gardeners don't need yet another
> pitfall
> > to know to avoid. :)
>

[evanm, 2010-12-01 16:43:08]

Oh, I looked up the changelist now.
Yeah, I don't think it's much of a problem.  It's just a warning
because we have to guess at what you really wanted.

On Wed, Dec 1, 2010 at 8:29 AM, Jochen Eisinger <jochen@chromium.org> wrote:
> well, when webkit is rolled to a rev that corresponds to a commit to a
> (webkit) branch, sync-webkit-git.py complains and syncs to the next smaller
> revision that corresponds to a commit to the webkit trunk (which is the
> right thing to do, but getting a warning is annoying anyway).
> So I guess there's not much we can do :)
>
> On Wed, Dec 1, 2010 at 5:23 PM, Evan Martin <evanm@google.com> wrote:
>>
>> I don't know what you are talking about.
>>
>> On Wed, Dec 1, 2010 at 8:04 AM, Ojan Vafai <ojan@google.com> wrote:
>> > On Wed, Dec 1, 2010 at 7:57 AM, <jochen@chromium.org> wrote:
>> >>
>> >> On 2010/12/01 15:56:50, jochen wrote:
>> >>>
>> >>> When you use tools/sync-webkit-git.py to maintain a git checkout of
>> >>> webkit in
>> >>> your chromium checkout, the script has to guess what revision you
>> >>> actual
>> >>> want
>> >>
>> >> i.e. the git svn bridge only has git revisions for svn revisions on the
>> >> trunk
>> >
>> > Ugh. That's annoying. This patch LGTM. I wonder if there's a way we can
>> > my
>> > sync-webkit-git.py smarter. WebKit gardeners don't need yet another
>> > pitfall
>> > to know to avoid. :)
>
>