In bug 205843 the commit queue rejected a patch because of problems merging the Changelogs. Could someone please investigate why this happened? The patch was rebased within 1-2 hours of cq'ing it. Output from that bug: ------------ Rejecting attachment 387541 [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', 387541, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=387541&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=205843&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Updating working directory Processing patch 387541 from bug 205843. Fetching: https://bugs.webkit.org/attachment.cgi?id=387541 Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Committing to http://svn.webkit.org/repository/webkit/trunk ... M Source/ThirdParty/ANGLE/ChangeLog M Source/ThirdParty/ANGLE/include/platform/FeaturesGL.h M Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/StateManagerGL.cpp M Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp M Source/WebCore/ChangeLog ERROR from SVN: Item is out of date: File '/trunk/Source/WebCore/ChangeLog' is out of date W: 62293dba1609d9c4b11eaae384e2b64491a8a491 and refs/remotes/origin/master differ, using rebase: :040000 040000 9725039836045fb21b1ae975d6de27a29aea4688 7d9fac8039936a3a2145972b42321dd7fff2322f M Source 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 ... M Source/ThirdParty/ANGLE/ChangeLog M Source/ThirdParty/ANGLE/include/platform/FeaturesGL.h M Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/StateManagerGL.cpp M Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp M Source/WebCore/ChangeLog ERROR from SVN: Item is out of date: File '/trunk/Source/WebCore/ChangeLog' is out of date W: 62293dba1609d9c4b11eaae384e2b64491a8a491 and refs/remotes/origin/master differ, using rebase: :040000 040000 9725039836045fb21b1ae975d6de27a29aea4688 7d9fac8039936a3a2145972b42321dd7fff2322f M Source 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 From https://git.webkit.org/git/WebKit 3c87feb64b3..004dc49159c master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 254452 = 3c87feb64b39bb92c94fd24f85882760a74fbc4c r254453 = 5cbb5091ac1a97ec6658059137c1e235d19e61ed r254454 = 004dc49159ce1ab648160048199ae292234d6839 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: https://webkit-queues.webkit.org/results/13303626
Just for reference https://webkit-queues.webkit.org/patch/387541/commit-queue
Thanks for pointing this out. The error coming from the CQ is incorrect then. For what it's worth, my patch definitely didn't cause those test failures - they are either persistently failing or flaky tests.
Yeah, it seems like a bug in commit-queue. I will try to look into it. The layout-test failure is tracked in https://bugs.webkit.org/show_bug.cgi?id=206192
<rdar://problem/58759518>
Commit-queue has been re-implemented from scratch. Please file a new bug if you notice such issue. Also note that this issue happened because most likely because there was another commit which modified Source/WebCore/ChangeLog after commit-queue applied this patch locally and before commit-queue tried to land it. This issue usually happens with large patches.