Closed Bug 1866837 Opened 7 months ago Closed 7 months ago

Update web-platform-tests to 51c42fc2c8bfb4ccb07317cc034479f56ada9ba6

Categories

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

task

Tracking

(firefox122 fixed)

RESOLVED FIXED
122 Branch
Tracking Status
firefox122 --- fixed

People

(Reporter: wpt-sync, Unassigned)

References

Details

(Whiteboard: [wptsync landing])

Retriggered failing web-platform-test tasks on try before final metadata update.
Whiteboard: [wptsync landing] → [wptsync landing error]
Landing failed due to conficts during rebase
This requires fixup from a wpt sync admin.
Flags: needinfo?(james)
Flags: needinfo?(aborovova)
Rebasing onto latest gecko failed:
Cmd('git') failed due to: exit code(1)
  cmdline: git rebase 7030b2b2fcf156b73ae97f63a49e5023639c2569
  stdout: 'Auto-merging testing/web-platform/meta/layout-instability/content-visibility-auto-resize.html.ini
CONFLICT (content): Merge conflict in testing/web-platform/meta/layout-instability/content-visibility-auto-resize.html.ini'
  stderr: 'Rebasing (1/40)
Rebasing (2/40)
Rebasing (3/40)
Rebasing (4/40)
Rebasing (5/40)
Rebasing (6/40)
Rebasing (7/40)
Rebasing (8/40)
Rebasing (9/40)
Rebasing (10/40)
Rebasing (11/40)
Rebasing (12/40)
Rebasing (13/40)
Rebasing (14/40)
Rebasing (15/40)
Rebasing (16/40)
Rebasing (17/40)
Rebasing (18/40)
Rebasing (19/40)
Rebasing (20/40)
Rebasing (21/40)
Rebasing (22/40)
Rebasing (23/40)
Rebasing (24/40)
Rebasing (25/40)
Rebasing (26/40)
Rebasing (27/40)
Rebasing (28/40)
Rebasing (29/40)
Rebasing (30/40)
Rebasing (31/40)
Rebasing (32/40)
Rebasing (33/40)
Rebasing (34/40)
Rebasing (35/40)
Rebasing (36/40)
Rebasing (37/40)
Rebasing (38/40)
Rebasing (39/40)
Rebasing (40/40)
error: could not apply 6c274ed6f71d8... Bug 1866837 - [wpt-sync] Update web-platform-tests to 51c42fc2c8bfb4ccb07317cc034479f56ada9ba6, a=testonly
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 6c274ed6f71d8... Bug 1866837 - [wpt-sync] Update web-platform-tests to 51c42fc2c8bfb4ccb07317cc034479f56ada9ba6, a=testonly pick fbcf67a89698c Bug 1866167 - Add mlssin'
Pushed by wptsync@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/267971ce0551
[wpt-sync] Update web-platform-tests to 51c42fc2c8bfb4ccb07317cc034479f56ada9ba6, a=testonly
Flags: needinfo?(james)
Flags: needinfo?(aborovova)
Status: NEW → RESOLVED
Closed: 7 months ago
Resolution: --- → FIXED
Target Milestone: --- → 122 Branch
Whiteboard: [wptsync landing error] → [wptsync landing]
You need to log in before you can comment on or make changes to this bug.