[Webkit-unassigned] [Bug 100126] [EFL] Add baselines for non problematic tests in editing subcategories: deleting, inserting, selection and style.
bugzilla-daemon at webkit.org
bugzilla-daemon at webkit.org
Thu Oct 25 14:18:09 PDT 2012
https://bugs.webkit.org/show_bug.cgi?id=100126
WebKit Review Bot <webkit.review.bot at gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Attachment #170577|commit-queue+ |commit-queue-
Flag| |
--- Comment #11 from WebKit Review Bot <webkit.review.bot at gmail.com> 2012-10-25 14:19:17 PST ---
(From update of attachment 170577)
Rejecting attachment 170577 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:
ore/ChangeLog
CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog
Failed to merge in the changes.
Patch failed at 0001 CHROMIUM: Add a method to WebLayerTreeView API
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/14569709
--
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