Open Bug 1789375 Opened 2 years ago Updated 2 years ago

Update web-platform-tests to 6c984bfb9ec3d93792e48ab4662350ea144f2846

Categories

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

task

Tracking

(Not tracked)

People

(Reporter: mozilla.org, Unassigned)

References

Details

(Whiteboard: [wptsync landing error])

No description provided.
Retriggered failing web-platform-test tasks on try before final metadata update.
Rebasing onto latest gecko failed:
Cmd('git') failed due to: exit code(128)
  cmdline: git rebase 90b529ecbd50080d080fb01fae8fd781fcd17709
  stdout: 'First, rewinding head to replay your work on top of it...
Applying: Bug 1789221 [wpt PR 35726] - [scroll-animations] NodeLayoutUpgrade considers interleaving roots only, a=testonly
Applying: Bug 1789221 [wpt PR 35726] - Update wpt metadata, a=testonly
Applying: Bug 1789181 [wpt PR 35780] - Add test for underline edge skipping, a=testonly
Applying: Bug 1789181 [wpt PR 35780] - Update wpt metadata, a=testonly
Applying: Bug 1789205 [wpt PR 35782] - [scroll-animations] Determine forced updates using style roots, a=testonly
Applying: Bug 1789205 [wpt PR 35782] - Update wpt metadata, a=testonly
Applying: Bug 1789282 [wpt PR 35718] - [css-sizing] Test edge case with 0x0 last remembered size, a=testonly
Applying: Bug 1789185 [wpt PR 35781] - Prerender: Fix speculation-rules/prerender/workers.html, a=testonly
Applying: Bug 1789340 [wpt PR 35789] - Add ULP based assertion for testing WebNN API operations., a=testonly
Applying: Bug 1789375 - [wpt-sync] Update web-platform-tests to 6c984bfb9ec3d93792e48ab4662350ea144f2846, a=testonly
Using index info to reconstruct a base tree...
M	testing/web-platform/meta/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length2.html.ini
Falling back to patching base and 3-way merge...
Auto-merging testing/web-platform/meta/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length2.html.ini
CONFLICT (content): Merge conflict in testing/web-platform/meta/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length2.html.ini
Patch failed at 0010 Bug 1789375 - [wpt-sync] Update web-platform-tests to 6c984bfb9ec3d93792e48ab4662350ea144f2846, a=testonly
Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
'
  stderr: 'error: Failed to merge in the changes.'
Whiteboard: [wptsync landing] → [wptsync landing error]
Landing failed due to conficts during rebase
This requires fixup from a wpt sync admin.
Retriggered failing web-platform-test tasks on try before final metadata update.
You need to log in before you can comment on or make changes to this bug.