Bug 205133 – REGRESSION(r253376): Broke internal builds (Requested by smfr on #webkit).

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[WebKit Commit Bot]

https://trac.webkit.org/changeset/253376 broke the build:
Broke internal builds (Requested by smfr on #webkit).

This is an automatic bug report generated by webkitbot. If this bug
report was created because of a flaky test, please file a bug for the flaky
test (if we don't already have one on file) and dup this bug against that bug
so that we can track how often these flaky tests fail.

[WebKit Commit Bot]

Created attachment 385431 [details]
ROLLOUT of r253376

Any committer can land this patch automatically by marking it commit-queue+.  The commit-queue will build and test the patch before landing to ensure that the rollout will be successful.  This process takes approximately 15 minutes.

If you would like to land the rollout faster, you can use the following command:

  webkit-patch land-attachment ATTACHMENT_ID

where ATTACHMENT_ID is the ID of this attachment.

[WebKit Commit Bot]

Comment on attachment 385431 [details]
ROLLOUT of r253376

Rejecting attachment 385431 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 385431, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Last 5000 characters of output:
/ChangeLog'
W: e613a9a6a8e1c830e5f6adaed44ac0ca1c61795b and refs/remotes/origin/master differ, using rebase:
:040000 040000 f24d998dfc3c11919cac39ded5c15cf7cf7fedf3 42164bfad444b8e33206a52ecf7b8321ec0f502b M	Source
:040000 040000 0a1646b1f809bb32c715964fd38443d963f28e64 cff12787e99cb72e08b94f49ce62641a492b9cab M	Tools
Current branch master is up to date.
ERROR: Not all changes have been committed into SVN, however the committed
ones (if any) seem to be successfully integrated into the working tree.
Please see the above messages for details.


Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Committing to http://svn.webkit.org/repository/webkit/trunk ...
	D	Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.h
	D	Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm
	D	Source/WebKit/UIProcess/API/ios/WKWebViewTestingIOS.h
	D	Source/WebKit/UIProcess/API/ios/WKWebViewTestingIOS.mm
	D	Source/WebKit/UIProcess/API/mac/WKWebViewTestingMac.h
	D	Source/WebKit/UIProcess/API/mac/WKWebViewTestingMac.mm
	M	Source/WebKit/ChangeLog
	M	Source/WebKit/SourcesCocoa.txt
	M	Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h
	M	Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
	M	Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h
	M	Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h
	M	Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.mm
	M	Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
	M	Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
	M	Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.h
	M	Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm
	M	Source/WebKit/UIProcess/mac/PageClientImplMac.mm
	M	Source/WebKit/UIProcess/mac/WKFullScreenWindowController.h
	M	Source/WebKit/WebKit.xcodeproj/project.pbxproj
	M	Tools/ChangeLog
	M	Tools/MiniBrowser/Configurations/Base.xcconfig
	M	Tools/MiniBrowser/mac/WK2BrowserWindowController.m
	M	Tools/TestWebKitAPI/Configurations/Base.xcconfig
	M	Tools/TestWebKitAPI/EditingTestHarness.mm
	M	Tools/TestWebKitAPI/Tests/WebKit/ResponsivenessTimerCrash.mm
	M	Tools/TestWebKitAPI/Tests/WebKitCocoa/AnimatedResize.mm
	M	Tools/TestWebKitAPI/Tests/WebKitCocoa/DeviceOrientation.mm
	M	Tools/TestWebKitAPI/Tests/WebKitCocoa/DoubleDefersLoading.mm
	M	Tools/TestWebKitAPI/Tests/WebKitCocoa/InteractionDeadlockAfterCrash.mm
	M	Tools/TestWebKitAPI/Tests/WebKitCocoa/MediaBufferingPolicy.mm
	M	Tools/TestWebKitAPI/Tests/WebKitCocoa/NowPlayingControlsTests.mm
	M	Tools/TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm
	M	Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSuspendMediaBuffering.mm
	M	Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm
	M	Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm
	M	Tools/TestWebKitAPI/Tests/WebKitCocoa/SnapshotStore.mm
	M	Tools/TestWebKitAPI/Tests/WebKitCocoa/SystemPreview.mm
	M	Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm
	M	Tools/TestWebKitAPI/Tests/WebKitCocoa/UserMediaSimulateFailedSandbox.mm
	M	Tools/TestWebKitAPI/Tests/WebKitCocoa/VideoControlsManager.mm
	M	Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm
	M	Tools/TestWebKitAPI/Tests/WebKitCocoa/WKRequestActivatedElementInfo.mm
	M	Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewCandidateTests.mm
	M	Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewEditActions.mm
	M	Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewFirstResponderTests.mm
	M	Tools/TestWebKitAPI/Tests/ios/AccessibilityTestsIOS.mm
	M	Tools/TestWebKitAPI/Tests/ios/ActionSheetTests.mm
	M	Tools/TestWebKitAPI/Tests/ios/AutocorrectionTestsIOS.mm
	M	Tools/TestWebKitAPI/Tests/ios/FocusPreservationTests.mm
	M	Tools/TestWebKitAPI/cocoa/TestNavigationDelegate.mm
	M	Tools/TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm
	M	Tools/TestWebKitAPI/mac/DragAndDropSimulatorMac.mm
	M	Tools/WebKitTestRunner/Configurations/Base.xcconfig
	M	Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
	M	Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm
	M	Tools/WebKitTestRunner/cocoa/UIScriptControllerCocoa.mm
	M	Tools/WebKitTestRunner/ios/TestControllerIOS.mm
	M	Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm
	M	Tools/WebKitTestRunner/mac/UIScriptControllerMac.mm
	D+	Source/WebKit/UIProcess/API/ios/

ERROR from SVN:
Merge conflict during commit: Conflict at '/trunk/Source/WebKit/ChangeLog'
W: e613a9a6a8e1c830e5f6adaed44ac0ca1c61795b and refs/remotes/origin/master differ, using rebase:
:040000 040000 f24d998dfc3c11919cac39ded5c15cf7cf7fedf3 42164bfad444b8e33206a52ecf7b8321ec0f502b M	Source
:040000 040000 0a1646b1f809bb32c715964fd38443d963f28e64 cff12787e99cb72e08b94f49ce62641a492b9cab M	Tools
Current branch master is up to date.
ERROR: Not all changes have been committed into SVN, however the committed
ones (if any) seem to be successfully integrated into the working tree.
Please see the above messages for details.


Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit
Updating OpenSource
Current branch master is up to date.

Full output: https://webkit-queues.webkit.org/results/13290186

[Simon Fraser (smfr)]

Was rolled out manually in https://trac.webkit.org/changeset/253396/webkit

[Radar WebKit Bug Importer]

<rdar://problem/57860771>