Closed Bug 1475852 Opened Last year Closed Last year

Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191

Categories

(Testing :: web-platform-tests, enhancement)

enhancement
Not set

Tracking

(firefox63 fixed)

RESOLVED FIXED
mozilla63
Tracking Status
firefox63 --- fixed

People

(Reporter: wptsync, Unassigned)

References

Details

(Whiteboard: [wptsync landing error])

No description provided.
Retriggered failing web-platform-test tasks on try before final metadata update.
Whiteboard: [wptsync landing] → [wptsync landing error]
Rebase failed:
Cmd('git') failed due to: exit code(1)
  cmdline: git rebase 6b7932144bfe6ff16482c531dcc5e09026523889
  stderr: '
It seems that there is already a rebase-apply directory, and
I wonder if you are in the middle of another rebase.  If that is the
case, please try
	git rebase (--continue | --abort | --skip)
If that is not the case, please
	rm -fr "/app/repos/gecko/worktrees/1475852/rebase-apply"
and run me again.  I am stopping in case you still have something
valuable there.'
Rebase failed:
Cmd('git') failed due to: exit code(128)
  cmdline: git rebase 06b5682c7bc6c86f4e93167bd6991e0994843768
  stdout: 'First, rewinding head to replay your work on top of it...
Applying: Bug 1473989 [wpt PR 11830] - Update the page-visibility IDL file, a=testonly
Applying: Bug 1474039 [wpt PR 11832] - Update the media-capabilities IDL file, a=testonly
Applying: Bug 1473817 [wpt PR 11821] - Update the ServiceWorker IDL file, a=testonly
Applying: Bug 1473817 [wpt PR 11821] - Update wpt metadata, a=testonly
Applying: Bug 1474047 [wpt PR 11833] - Add idl_test helper to idlharness.js, a=testonly
Applying: Bug 1473355 [wpt PR 11774] - XRDevice should not extend EventTarget., a=testonly
Applying: Bug 1473660 [wpt PR 11807] - sensors: Fix flakiness in the same-origin access check tests, a=testonly
Applying: Bug 1473369 [wpt PR 11765] - Auto-update the appmanifest IDL file, a=testonly
Applying: Bug 1473369 [wpt PR 11765] - Update wpt metadata, a=testonly
Applying: Bug 1474074 [wpt PR 11842] - Sync Mozilla tests as of 2018-07-07, a=testonly
Applying: Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly
Using index info to reconstruct a base tree...
M	testing/web-platform/meta/MANIFEST.json
M	testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini
M	testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini
M	testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html.ini
A	testing/web-platform/meta/web-animations/timing-model/timelines/update-and-send-events.html.ini
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): testing/web-platform/meta/web-animations/timing-model/timelines/update-and-send-events.html.ini deleted in HEAD and modified in Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly. Version Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly of testing/web-platform/meta/web-animations/timing-model/timelines/update-and-send-events.html.ini left in tree.
CONFLICT (modify/delete): testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html.ini deleted in Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly and modified in HEAD. Version HEAD of testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html.ini left in tree.
CONFLICT (modify/delete): testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini deleted in Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly and modified in HEAD. Version HEAD of testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini left in tree.
CONFLICT (modify/delete): testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini deleted in Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly and modified in HEAD. Version HEAD of testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini left in tree.
Auto-merging testing/web-platform/meta/MANIFEST.json
Patch failed at 0011 Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly
The copy of the patch that failed is found in: /app/repos/gecko/worktrees/1475852/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".
'
  stderr: '/app/repos/gecko/worktrees/1475852/rebase-apply/patch:300: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
error: Failed to merge in the changes.'
Rebase failed:
Cmd('git') failed due to: exit code(128)
  cmdline: git rebase 141e6bcd588fc51cbbd5e2157a698f03cff61907
  stdout: 'First, rewinding head to replay your work on top of it...
Applying: Bug 1473989 [wpt PR 11830] - Update the page-visibility IDL file, a=testonly
Applying: Bug 1474039 [wpt PR 11832] - Update the media-capabilities IDL file, a=testonly
Applying: Bug 1473817 [wpt PR 11821] - Update the ServiceWorker IDL file, a=testonly
Applying: Bug 1473817 [wpt PR 11821] - Update wpt metadata, a=testonly
Applying: Bug 1474047 [wpt PR 11833] - Add idl_test helper to idlharness.js, a=testonly
Applying: Bug 1473355 [wpt PR 11774] - XRDevice should not extend EventTarget., a=testonly
Applying: Bug 1473660 [wpt PR 11807] - sensors: Fix flakiness in the same-origin access check tests, a=testonly
Applying: Bug 1473369 [wpt PR 11765] - Auto-update the appmanifest IDL file, a=testonly
Applying: Bug 1473369 [wpt PR 11765] - Update wpt metadata, a=testonly
Applying: Bug 1474074 [wpt PR 11842] - Sync Mozilla tests as of 2018-07-07, a=testonly
Applying: Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly
Using index info to reconstruct a base tree...
M	testing/web-platform/meta/MANIFEST.json
M	testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini
M	testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini
M	testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html.ini
A	testing/web-platform/meta/web-animations/timing-model/timelines/update-and-send-events.html.ini
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): testing/web-platform/meta/web-animations/timing-model/timelines/update-and-send-events.html.ini deleted in HEAD and modified in Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly. Version Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly of testing/web-platform/meta/web-animations/timing-model/timelines/update-and-send-events.html.ini left in tree.
CONFLICT (modify/delete): testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html.ini deleted in Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly and modified in HEAD. Version HEAD of testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html.ini left in tree.
CONFLICT (modify/delete): testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini deleted in Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly and modified in HEAD. Version HEAD of testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini left in tree.
CONFLICT (modify/delete): testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini deleted in Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly and modified in HEAD. Version HEAD of testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini left in tree.
Auto-merging testing/web-platform/meta/MANIFEST.json
Patch failed at 0011 Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly
The copy of the patch that failed is found in: /app/repos/gecko/worktrees/1475852/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".
'
  stderr: '/app/repos/gecko/worktrees/1475852/rebase-apply/patch:300: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
error: Failed to merge in the changes.'
Rebase failed:
Cmd('git') failed due to: exit code(128)
  cmdline: git rebase 0eaadb41345d4a7217dc58f3d9f26bab9393af1e
  stdout: 'First, rewinding head to replay your work on top of it...
Applying: Bug 1473989 [wpt PR 11830] - Update the page-visibility IDL file, a=testonly
Applying: Bug 1474039 [wpt PR 11832] - Update the media-capabilities IDL file, a=testonly
Applying: Bug 1473817 [wpt PR 11821] - Update the ServiceWorker IDL file, a=testonly
Applying: Bug 1473817 [wpt PR 11821] - Update wpt metadata, a=testonly
Applying: Bug 1474047 [wpt PR 11833] - Add idl_test helper to idlharness.js, a=testonly
Applying: Bug 1473355 [wpt PR 11774] - XRDevice should not extend EventTarget., a=testonly
Applying: Bug 1473660 [wpt PR 11807] - sensors: Fix flakiness in the same-origin access check tests, a=testonly
Applying: Bug 1473369 [wpt PR 11765] - Auto-update the appmanifest IDL file, a=testonly
Applying: Bug 1473369 [wpt PR 11765] - Update wpt metadata, a=testonly
Applying: Bug 1474074 [wpt PR 11842] - Sync Mozilla tests as of 2018-07-07, a=testonly
Applying: Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly
Using index info to reconstruct a base tree...
M	testing/web-platform/meta/MANIFEST.json
M	testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini
M	testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini
M	testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html.ini
A	testing/web-platform/meta/web-animations/timing-model/timelines/update-and-send-events.html.ini
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): testing/web-platform/meta/web-animations/timing-model/timelines/update-and-send-events.html.ini deleted in HEAD and modified in Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly. Version Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly of testing/web-platform/meta/web-animations/timing-model/timelines/update-and-send-events.html.ini left in tree.
CONFLICT (modify/delete): testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html.ini deleted in Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly and modified in HEAD. Version HEAD of testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html.ini left in tree.
CONFLICT (modify/delete): testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini deleted in Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly and modified in HEAD. Version HEAD of testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini left in tree.
CONFLICT (modify/delete): testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini deleted in Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly and modified in HEAD. Version HEAD of testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini left in tree.
Auto-merging testing/web-platform/meta/MANIFEST.json
Patch failed at 0011 Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly
The copy of the patch that failed is found in: /app/repos/gecko/worktrees/1475852/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".
'
  stderr: '/app/repos/gecko/worktrees/1475852/rebase-apply/patch:300: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
error: Failed to merge in the changes.'
Rebase failed:
Cmd('git') failed due to: exit code(128)
  cmdline: git rebase 0eaadb41345d4a7217dc58f3d9f26bab9393af1e
  stdout: 'First, rewinding head to replay your work on top of it...
Applying: Bug 1473989 [wpt PR 11830] - Update the page-visibility IDL file, a=testonly
Applying: Bug 1474039 [wpt PR 11832] - Update the media-capabilities IDL file, a=testonly
Applying: Bug 1473817 [wpt PR 11821] - Update the ServiceWorker IDL file, a=testonly
Applying: Bug 1473817 [wpt PR 11821] - Update wpt metadata, a=testonly
Applying: Bug 1474047 [wpt PR 11833] - Add idl_test helper to idlharness.js, a=testonly
Applying: Bug 1473355 [wpt PR 11774] - XRDevice should not extend EventTarget., a=testonly
Applying: Bug 1473660 [wpt PR 11807] - sensors: Fix flakiness in the same-origin access check tests, a=testonly
Applying: Bug 1473369 [wpt PR 11765] - Auto-update the appmanifest IDL file, a=testonly
Applying: Bug 1473369 [wpt PR 11765] - Update wpt metadata, a=testonly
Applying: Bug 1474074 [wpt PR 11842] - Sync Mozilla tests as of 2018-07-07, a=testonly
Applying: Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly
Using index info to reconstruct a base tree...
M	testing/web-platform/meta/MANIFEST.json
M	testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini
M	testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini
M	testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html.ini
A	testing/web-platform/meta/web-animations/timing-model/timelines/update-and-send-events.html.ini
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): testing/web-platform/meta/web-animations/timing-model/timelines/update-and-send-events.html.ini deleted in HEAD and modified in Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly. Version Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly of testing/web-platform/meta/web-animations/timing-model/timelines/update-and-send-events.html.ini left in tree.
CONFLICT (modify/delete): testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html.ini deleted in Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly and modified in HEAD. Version HEAD of testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html.ini left in tree.
CONFLICT (modify/delete): testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini deleted in Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly and modified in HEAD. Version HEAD of testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini left in tree.
CONFLICT (modify/delete): testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini deleted in Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly and modified in HEAD. Version HEAD of testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini left in tree.
Auto-merging testing/web-platform/meta/MANIFEST.json
Patch failed at 0011 Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly
The copy of the patch that failed is found in: /app/repos/gecko/worktrees/1475852/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".
'
  stderr: '/app/repos/gecko/worktrees/1475852/rebase-apply/patch:300: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
error: Failed to merge in the changes.'
Rebase failed:
Cmd('git') failed due to: exit code(128)
  cmdline: git rebase 56c91b124143e3c6de2924b51c2ad4a73578f9f8
  stdout: 'First, rewinding head to replay your work on top of it...
Applying: Bug 1473989 [wpt PR 11830] - Update the page-visibility IDL file, a=testonly
Applying: Bug 1474039 [wpt PR 11832] - Update the media-capabilities IDL file, a=testonly
Applying: Bug 1473817 [wpt PR 11821] - Update the ServiceWorker IDL file, a=testonly
Applying: Bug 1473817 [wpt PR 11821] - Update wpt metadata, a=testonly
Applying: Bug 1474047 [wpt PR 11833] - Add idl_test helper to idlharness.js, a=testonly
Applying: Bug 1473355 [wpt PR 11774] - XRDevice should not extend EventTarget., a=testonly
Applying: Bug 1473660 [wpt PR 11807] - sensors: Fix flakiness in the same-origin access check tests, a=testonly
Applying: Bug 1473369 [wpt PR 11765] - Auto-update the appmanifest IDL file, a=testonly
Applying: Bug 1473369 [wpt PR 11765] - Update wpt metadata, a=testonly
Applying: Bug 1474074 [wpt PR 11842] - Sync Mozilla tests as of 2018-07-07, a=testonly
Applying: Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly
Using index info to reconstruct a base tree...
M	testing/web-platform/meta/MANIFEST.json
M	testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini
M	testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini
M	testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html.ini
A	testing/web-platform/meta/web-animations/timing-model/timelines/update-and-send-events.html.ini
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): testing/web-platform/meta/web-animations/timing-model/timelines/update-and-send-events.html.ini deleted in HEAD and modified in Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly. Version Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly of testing/web-platform/meta/web-animations/timing-model/timelines/update-and-send-events.html.ini left in tree.
CONFLICT (modify/delete): testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html.ini deleted in Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly and modified in HEAD. Version HEAD of testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html.ini left in tree.
CONFLICT (modify/delete): testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini deleted in Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly and modified in HEAD. Version HEAD of testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini left in tree.
CONFLICT (modify/delete): testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini deleted in Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly and modified in HEAD. Version HEAD of testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini left in tree.
Auto-merging testing/web-platform/meta/MANIFEST.json
Patch failed at 0011 Bug 1475852 - [wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly
The copy of the patch that failed is found in: /app/repos/gecko/worktrees/1475852/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".
'
  stderr: '/app/repos/gecko/worktrees/1475852/rebase-apply/patch:300: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
error: Failed to merge in the changes.'
Pushed by wptsync@mozilla.com:
https://hg.mozilla.org/integration/mozilla-inbound/rev/25c433c61280
[wpt-sync] Update web-platform-tests to 227112be511ed8f8b2617df1fdd90c5fbf44c191, a=testonly
Pushed by james@hoppipolla.co.uk:
https://hg.mozilla.org/integration/mozilla-inbound/rev/f080d58c98d0
Revert bogus metadata changes in /css/css-masking/clip-path/ tests, a=testonly
https://hg.mozilla.org/mozilla-central/rev/25c433c61280
https://hg.mozilla.org/mozilla-central/rev/f080d58c98d0
Status: NEW → RESOLVED
Closed: Last year
Resolution: --- → FIXED
Target Milestone: --- → mozilla63
Looks like this re-added:

  testing/web-platform/meta/web-animations/timing-model/timelines/update-and-send-events.html.ini

which was removed in bug 1475127
Pushed by bbirtles@mozilla.com:
https://hg.mozilla.org/integration/mozilla-inbound/rev/2a31d9153471
Revert bogus re-addition of update-and-send-events.html.ini meta file by wpt-sync bot; a=testonly
See Also: → 1478551
(Ok, that was super weird. I filed bug 1478551 to track the cause of this and added this bug to its "See Also" field, and now the "See Also" showed up on _this_ bug? I don't understand computers.)
You need to log in before you can comment on or make changes to this bug.