[webkit-dev] Can no longer commit manually or via CQ?

[Chris Dumez]

Hi,

I can no longer commit locally (I am using git-svn). It complains about me having 30 or so local commits (which is not true).

Therefore, I tried using the commit queue but it fails to commit as well:
Comment 3 <https://bugs.webkit.org/show_bug.cgi?id=158943#c3>

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

Last 500 characters of output:
1 Try to fix the iOS build after r202142 and r202224.
The copy of the patch that failed is found in:
   /Volumes/Data/EWS/WebKit/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

rebase refs/remotes/origin/master: command returned error: 1

Died at /Volumes/Data/EWS/WebKit/Tools/Scripts/webkitdirs.pm line 2661.

Kr,
--
 Chris Dumez




-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.webkit.org/pipermail/webkit-dev/attachments/20160620/b6a45c16/attachment.html>