Bug 51147

Created attachment 76702 [details] Rebaseline

Comment on attachment 76702 [details] Rebaseline The change to LayoutTests/http/tests/misc/authentication-sent-to-redirect-expected.txt should not be necessary.

Created attachment 76781 [details] Rebaseline In addition to the Chromium-related rebaselining, I am also fixing plugins/document-open.html.

(In reply to comment #2) > The change to LayoutTests/http/tests/misc/authentication-sent-to-redirect-expected.txt should not be necessary. For some odd reason, even with the new change done by the author, I still had to add newlines for this test to the expectation files from platform/chromium-mac/ and platform/chromium-win/. I tested all rebaselines on chromium-mac and chromium-linux.

Comment on attachment 76781 [details] Rebaseline Rejecting attachment 76781 [details] from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-3', 'apply-attachment', '--non-interactive', 76781]" exit_code: 2 Last 500 characters of output: ailed to merge in the changes. Patch failed at 0001 2010-12-16 Yury Semikhatsky <yurys@chromium.org> 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 WebKitTools/Scripts/update-webkit line 132. Failed to run "['WebKitTools/Scripts/update-webkit']" exit_code: 2 Full output: http://queues.webkit.org/results/7154067

(In reply to comment #5) > (From update of attachment 76781 [details]) > Rejecting attachment 76781 [details] from commit-queue. I don't understand this failure: "CONFLICT (content): Merge conflict in WebCore/ChangeLog. Failed to merge in the changes." I did not submit a WebCore/ChangeLog. Could this be another tooling malfunction, perhaps?

Setting cq? flag again.

Comment on attachment 76781 [details] Rebaseline Rejecting attachment 76781 [details] from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-3', 'apply-attachment', '--non-interactive', 76781]" exit_code: 2 Last 500 characters of output: ailed to merge in the changes. Patch failed at 0001 2010-12-16 Yury Semikhatsky <yurys@chromium.org> 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 WebKitTools/Scripts/update-webkit line 132. Failed to run "['WebKitTools/Scripts/update-webkit']" exit_code: 2 Full output: http://queues.webkit.org/results/7108087

Comment on attachment 76781 [details] Rebaseline Rejecting attachment 76781 [details] from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-3', 'apply-attachment', '--non-interactive', 76781]" exit_code: 2 Last 500 characters of output: ailed to merge in the changes. Patch failed at 0001 2010-12-16 Yury Semikhatsky <yurys@chromium.org> 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 WebKitTools/Scripts/update-webkit line 132. Failed to run "['WebKitTools/Scripts/update-webkit']" exit_code: 2 Full output: http://queues.webkit.org/results/7108088

Comment on attachment 76781 [details] Rebaseline Clearing flags on attachment: 76781 Committed r74211: <http://trac.webkit.org/changeset/74211>

All reviewed patches have been landed. Closing bug.

Sorry, the queue got upset. Still not sure how its repository got corrupted so. I'm fixing it now.