Bug 99828 - [EFL] Gardening to make the bots green
Summary: [EFL] Gardening to make the bots green
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit EFL (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Sudarsana Nagineni (babu)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-10-19 03:30 PDT by Sudarsana Nagineni (babu)
Modified: 2012-10-19 05:30 PDT (History)
2 users (show)

See Also:

Attachments
Patch (3.63 KB, patch)
2012-10-19 03:35 PDT, Sudarsana Nagineni (babu) 		no flags Details | Formatted Diff | Diff
Patch V2 (2.25 KB, patch)
2012-10-19 03:45 PDT, Sudarsana Nagineni (babu) 		no flags Details | Formatted Diff | Diff
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Sudarsana Nagineni (babu) 2012-10-19 03:30:35 PDT 
Gardening to make the bots green.

Regressions: Unexpected text-only failures : (4)
  editing/pasteboard/copy-paste-first-line-in-textarea.html [ Failure ] 
  fast/lists/w3-css3-list-styles-alphabetic.html [ Failure ] 
  fast/lists/w3-css3-list-styles-fallback-style.html [ Failure ] 
  fast/lists/w3-list-styles.html [ Failure ]
Comment 1 Sudarsana Nagineni (babu) 2012-10-19 03:35:05 PDT 
Created attachment 169589 [details]
Patch
Comment 2 Sudarsana Nagineni (babu) 2012-10-19 03:45:46 PDT 
Created attachment 169593 [details]
Patch V2
Comment 3 WebKit Review Bot 2012-10-19 04:32:31 PDT 
Comment on attachment 169593 [details]
Patch V2

Rejecting attachment 169593 [details] 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:
CT (content): Merge conflict in Source/WebCore/ChangeLog
Failed to merge in the changes.
Patch failed at 0001 [EFL] Rebaseline pixel expectation that is rendered correctly now.

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/14461409
Comment 4 WebKit Review Bot 2012-10-19 05:30:50 PDT 
Comment on attachment 169593 [details]
Patch V2

Clearing flags on attachment: 169593

Committed r131890: <http://trac.webkit.org/changeset/131890>
Comment 5 WebKit Review Bot 2012-10-19 05:30:53 PDT 
All reviewed patches have been landed.  Closing bug.