[Webkit-unassigned] [Bug 75812] JSC should be a triple-tier VM

[bugzilla-daemon at webkit.org]

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





--- Comment #104 from WebKit Review Bot <webkit.review.bot at gmail.com>  2012-02-15 01:26:48 PST ---
Attachment 127001 did not pass style-queue:

Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9

Updating OpenSource
    M    ChangeLog
    A    LayoutTests/fast/css/style-scoped/registering-shadowroot-expected.txt
    A    LayoutTests/fast/css/style-scoped/registering-shadowroot.html
    M    LayoutTests/ChangeLog
    M    Source/WebCore/WebCore.exp.in
    M    Source/WebCore/testing/Internals.cpp
    M    Source/WebCore/testing/Internals.h
    M    Source/WebCore/testing/Internals.idl
    M    Source/WebCore/dom/ShadowRootList.h
    M    Source/WebCore/dom/ShadowRootList.cpp
    M    Source/WebCore/dom/Element.cpp
    M    Source/WebCore/dom/Node.h
    M    Source/WebCore/dom/Element.h
    M    Source/WebCore/dom/NodeRareData.h
    M    Source/WebCore/dom/Node.cpp
    M    Source/WebCore/dom/ElementRareData.h
    M    Source/WebCore/ChangeLog
    M    Source/WebCore/platform/graphics/FontCache.cpp
    M    Source/WebCore/html/HTMLStyleElement.cpp
    M    Source/autotools/symbols.filter
    M    Source/WebKit2/ChangeLog
    M    Source/WebKit2/win/WebKit2CFLite.def
    M    Source/WebKit2/win/WebKit2.def
r107794 = c59b9dab74417b86c7b5b60a4408ab3e5d1659a8 (refs/remotes/origin/master)
First, rewinding head to replay your work on top of it...
Applying: [Mac][Win][WK2] Switch to RFC 6455 protocol for WebSockets
Using index info to reconstruct a base tree...
<stdin>:1578: trailing whitespace.

<stdin>:1647: trailing whitespace.

<stdin>:1657: trailing whitespace.

<stdin>:1672: trailing whitespace.
        return 0;        
<stdin>:1674: trailing whitespace.

warning: squelched 7 whitespace errors
warning: 12 lines add whitespace errors.
Falling back to patching base and 3-way merge...
warning: too many files (created: 168755 deleted: 3), skipping inexact rename detection
Auto-merging LayoutTests/ChangeLog
CONFLICT (content): Merge conflict in LayoutTests/ChangeLog
Auto-merging LayoutTests/platform/wk2/Skipped
Auto-merging Source/WebCore/ChangeLog
CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog
Auto-merging Source/WebCore/css/CSSCalculationValue.cpp
Auto-merging Source/WebCore/css/CSSCalculationValue.h
Auto-merging Source/WebCore/css/CSSParser.cpp
Auto-merging Source/WebKit/mac/ChangeLog
CONFLICT (content): Merge conflict in Source/WebKit/mac/ChangeLog
Auto-merging Source/WebKit2/ChangeLog
CONFLICT (content): Merge conflict in Source/WebKit2/ChangeLog
Auto-merging Tools/ChangeLog
CONFLICT (content): Merge conflict in Tools/ChangeLog
Failed to merge in the changes.
Patch failed at 0001 [Mac][Win][WK2] Switch to RFC 6455 protocol for WebSockets

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

rebase refs/remotes/origin/master: command returned error: 1

Died at Tools/Scripts/update-webkit line 164.


If any of these errors are false positives, please file a bug against check-webkit-style.

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