[Webkit-unassigned] [Bug 98052] [BlackBerry] Add a early return in buildCMakeProjectOrExit()

Mon Oct 1 12:12:10 PDT 2012

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

WebKit Review Bot <webkit.review.bot at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
 Attachment #166515|commit-queue+               |commit-queue-
               Flag|                            |

--- Comment #5 from WebKit Review Bot <webkit.review.bot at gmail.com>  2012-10-01 12:12:34 PST ---
(From update of attachment 166515)
Rejecting attachment 166515 from commit-queue.

Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2

Last 500 characters of output:
CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog
Failed to merge in the changes.
Patch failed at 0001 [chromium] ASSERT that the embedder has set a default locale

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.

Full output: http://queues.webkit.org/results/14124035

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