[Webkit-unassigned] [Bug 102270] IndexedDB: Replace int64 with int64_t
bugzilla-daemon at webkit.org
bugzilla-daemon at webkit.org
Wed Nov 14 14:11:05 PST 2012
https://bugs.webkit.org/show_bug.cgi?id=102270
WebKit Review Bot <webkit.review.bot at gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Attachment #174242|commit-queue+ |commit-queue-
Flag| |
--- Comment #5 from WebKit Review Bot <webkit.review.bot at gmail.com> 2012-11-14 14:12:53 PST ---
(From update of attachment 174242)
Rejecting attachment 174242 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:
: Merge conflict in Source/WebCore/ChangeLog
Failed to merge in the changes.
Patch failed at 0001 Coordinated Graphics: Rename m_CoordinatedGraphicsLayerClient to m_coordinator
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 154.
Full output: http://queues.webkit.org/results/14832512
--
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
More information about the webkit-unassigned
mailing list