Closed Bug 1828436 Opened 2 years ago Closed 2 years ago

Update web-platform-tests to 260e9744d6d64c5ae2cea4cdb7a6e67f74708e5b

Categories

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

task

Tracking

(firefox114 fixed)

RESOLVED FIXED
114 Branch
Tracking Status
firefox114 --- fixed

People

(Reporter: wpt-sync, Unassigned)

References

Details

(Whiteboard: [wptsync landing])

Retriggered failing web-platform-test tasks on try before final metadata update.
Rebasing onto latest gecko failed: Cmd('git') failed due to: exit code(1) cmdline: git rebase b2d70e4676fe5fc44cb7da82ca73c5e4827fb188 stdout: 'Auto-merging testing/web-platform/meta/html/browsers/history/the-history-interface/005.html.ini CONFLICT (content): Merge conflict in testing/web-platform/meta/html/browsers/history/the-history-interface/005.html.ini Auto-merging testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-fetch-error-external-classic.html.ini CONFLICT (content): Merge conflict in testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-fetch-error-external-classic.html.ini Auto-merging testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-fetch-error-external-module.html.ini CONFLICT (content): Merge conflict in testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-fetch-error-external-module.html.ini Auto-merging testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-external-classic.html.ini CONFLICT (content): Merge conflict in testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-external-classic.html.ini Auto-merging testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-external-module.html.ini CONFLICT (content): Merge conflict in testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-external-module.html.ini Auto-merging testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-external-classic.html.ini CONFLICT (content): Merge conflict in testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-external-classic.html.ini Auto-merging testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-external-module.html.ini CONFLICT (content): Merge conflict in testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-external-module.html.ini Auto-merging testing/web-platform/meta/storage-access-api/requestStorageAccess-nested-cross-site-iframe.sub.https.window.js.ini CONFLICT (content): Merge conflict in testing/web-platform/meta/storage-access-api/requestStorageAccess-nested-cross-site-iframe.sub.https.window.js.ini' stderr: 'Rebasing (1/100) Rebasing (2/100) Rebasing (3/100) Rebasing (4/100) Rebasing (5/100) Rebasing (6/100) Rebasing (7/100) Rebasing (8/100) Rebasing (9/100) Rebasing (10/100) Rebasing (11/100) Rebasing (12/100) Rebasing (13/100) Rebasing (14/100) Rebasing (15/100) Rebasing (16/100) Rebasing (17/100) Rebasing (18/100) Rebasing (19/100) Rebasing (20/100) Rebasing (21/100) Rebasing (22/100) Rebasing (23/100) Rebasing (24/100) Rebasing (25/100) Rebasing (26/100) Rebasing (27/100) Rebasing (28/100) Rebasing (29/100) Rebasing (30/100) Rebasing (31/100) Rebasing (32/100) Rebasing (33/100) Rebasing (34/100) Rebasing (35/100) Rebasing (36/100) Rebasing (37/100) Rebasing (38/100) Rebasing (39/100) Rebasing (40/100) Rebasing (41/100) Rebasing (42/100) Rebasing (43/100) Rebasing (44/100) Rebasing (45/100) Rebasing (46/100) Rebasing (47/100) Rebasing (48/100) Rebasing (49/100) Rebasing (50/100) Rebasing (51/100) Rebasing (52/100) Rebasing (53/100) Rebasing (54/100) Rebasing (55/100) Rebasing (56/100) Rebasing (57/100) Rebasing (58/100) Rebasing (59/100) Rebasing (60/100) Rebasing (61/100) Rebasing (62/100) Rebasing (63/100) Rebasing (64/100) Rebasing (65/100) Rebasing (66/100) Rebasing (67/100) Rebasing (68/100) Rebasing (69/100) Rebasing (70/100) Rebasing (71/100) Rebasing (72/100) Rebasing (73/100) Rebasing (74/100) Rebasing (75/100) Rebasing (76/100) Rebasing (77/100) Rebasing (78/100) Rebasing (79/100) Rebasing (80/100) Rebasing (81/100) Rebasing (82/100) Rebasing (83/100) Rebasing (84/100) Rebasing (85/100) Rebasing (86/100) Rebasing (87/100) Rebasing (88/100) Rebasing (89/100) Rebasing (90/100) Rebasing (91/100) Rebasing (92/100) Rebasing (93/100) Rebasing (94/100) Rebasing (95/100) Rebasing (96/100) Rebasing (97/100) Rebasing (98/100) Rebasing (99/100) Rebasing (100/100) error: could not apply aab8d32be6768... Bug 1828436 - [wpt-sync] Update web-platform-tests to 260e9744d6d64c5ae2cea4cdb7a6e67f74708e5b, 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 aab8d32be6768... Bug 1828436 - [wpt-sync] Update web-platform-tests to 260e9744d6d64c5ae2cea4cdb7a6e67f74708e5b, a=testonly'
Pushed by wptsync@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/c44bc1ab4db8 [wpt-sync] Update web-platform-tests to 260e9744d6d64c5ae2cea4cdb7a6e67f74708e5b, a=testonly
Status: NEW → RESOLVED
Closed: 2 years ago
Resolution: --- → FIXED
Target Milestone: --- → 114 Branch
You need to log in before you can comment on or make changes to this bug.