Closed Bug 2041338 Opened 3 months ago Closed 3 months ago

Update web-platform-tests to 50d89377a55f32a4a23bf41cfd026b01f8732246

Categories

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

task

Tracking

(firefox153 fixed)

RESOLVED FIXED
153 Branch
Tracking Status
firefox153 --- fixed

People

(Reporter: wpt-sync, Unassigned)

References

(Blocks 1 open bug)

Details

(Whiteboard: [wptsync landing])

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)

Retriggered failing web-platform-test tasks on try before final metadata update.

Flags: needinfo?(james)
Flags: needinfo?(aborovova)
Flags: needinfo?(james)
Flags: needinfo?(aborovova)

Rebasing onto latest gecko failed:
Cmd('git') failed due to: exit code(1)
cmdline: git rebase 043f54669c50a538b3f80647ad64695d35c13df4
stdout: 'Auto-merging testing/web-platform/meta/html/semantics/popovers/popover-remove-attribute-during-focusing-steps.html.ini
CONFLICT (content): Merge conflict in testing/web-platform/meta/html/semantics/popovers/popover-remove-attribute-during-focusing-steps.html.ini'
stderr: 'Rebasing (1/55)
Rebasing (2/55)
Rebasing (3/55)
Rebasing (4/55)
Rebasing (5/55)
Rebasing (6/55)
Rebasing (7/55)
Rebasing (8/55)
Rebasing (9/55)
Rebasing (10/55)
Rebasing (11/55)
Rebasing (12/55)
Rebasing (13/55)
Rebasing (14/55)
Rebasing (15/55)
Rebasing (16/55)
Rebasing (17/55)
Rebasing (18/55)
Rebasing (19/55)
Rebasing (20/55)
Rebasing (21/55)
Rebasing (22/55)
Rebasing (23/55)
Rebasing (24/55)
Rebasing (25/55)
Rebasing (26/55)
Rebasing (27/55)
Rebasing (28/55)
Rebasing (29/55)
Rebasing (30/55)
Rebasing (31/55)
Rebasing (32/55)
Rebasing (33/55)
Rebasing (34/55)
Rebasing (35/55)
Rebasing (36/55)
Rebasing (37/55)
Rebasing (38/55)
Rebasing (39/55)
Rebasing (40/55)
Rebasing (41/55)
Rebasing (42/55)
Rebasing (43/55)
Rebasing (44/55)
Rebasing (45/55)
Rebasing (46/55)
Rebasing (47/55)
Rebasing (48/55)
Rebasing (49/55)
Rebasing (50/55)
Rebasing (51/55)
Rebasing (52/55)
Rebasing (53/55)
Rebasing (54/55)
Rebasing (55/55)
error: could not apply 9d42b29dffce19... Bug 2041338 - [wpt-sync] Update web-platform-tests to 50d89377a55f32a4a23bf41cfd026b01f8732246, 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 9d42b29dffce19... Bug 2041338 - [wpt-sync] Update web-platform-tests to 50d89377a55f32a4a23bf41cfd026b01f8732246, a=testonly'

Pushed by wptsync@mozilla.com: https://github.com/mozilla-firefox/firefox/commit/1a71d0bff55f https://hg.mozilla.org/integration/autoland/rev/936dabdd5130 [wpt PR 60013] - [soft navs] Add a test for modifying inline elements, a=testonly https://github.com/mozilla-firefox/firefox/commit/ff420ad96d75 https://hg.mozilla.org/integration/autoland/rev/c59c9610d73e [wpt-sync] Update web-platform-tests to 50d89377a55f32a4a23bf41cfd026b01f8732246, a=testonly
Whiteboard: [wptsync landing error] → [wptsync landing]
Status: NEW → RESOLVED
Closed: 3 months ago
Resolution: --- → FIXED
Target Milestone: --- → 153 Branch
Flags: needinfo?(james)
Flags: needinfo?(aborovova)
You need to log in before you can comment on or make changes to this bug.