Closed Bug 1827782 Opened 3 years ago Closed 3 years ago

Update web-platform-tests to e27d35c6a232f7de611ad3dbf0d97fc4a11179b8

Categories

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

task

Tracking

(firefox114 fixed)

RESOLVED FIXED
114 Branch
Tracking Status
firefox114 --- fixed

People

(Reporter: wpt-sync, Unassigned)

References

(Regressed 1 open bug)

Details

(Whiteboard: [wptsync landing])

Attachments

(1 file)

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.
Rebasing onto latest gecko failed: Cmd('git') failed due to: exit code(1) cmdline: git rebase 376cbf028a2c1153ebc7394122196bdde9f5fafb stdout: 'Auto-merging testing/web-platform/meta/browsing-topics/__dir__.ini CONFLICT (content): Merge conflict in testing/web-platform/meta/browsing-topics/__dir__.ini Auto-merging testing/web-platform/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-204-fragment.html.ini CONFLICT (content): Merge conflict in testing/web-platform/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-204-fragment.html.ini 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/browsers/history/the-history-interface/traverse-during-unload.html.ini CONFLICT (content): Merge conflict in testing/web-platform/meta/html/browsers/history/the-history-interface/traverse-during-unload.html.ini' stderr: 'Rebasing (1/185) Rebasing (2/185) Rebasing (3/185) Rebasing (4/185) Rebasing (5/185) Rebasing (6/185) Rebasing (7/185) Rebasing (8/185) Rebasing (9/185) Rebasing (10/185) Rebasing (11/185) Rebasing (12/185) Rebasing (13/185) Rebasing (14/185) Rebasing (15/185) Rebasing (16/185) Rebasing (17/185) Rebasing (18/185) Rebasing (19/185) Rebasing (20/185) Rebasing (21/185) Rebasing (22/185) Rebasing (23/185) Rebasing (24/185) Rebasing (25/185) Rebasing (26/185) Rebasing (27/185) Rebasing (28/185) Rebasing (29/185) Rebasing (30/185) Rebasing (31/185) Rebasing (32/185) Rebasing (33/185) Rebasing (34/185) Rebasing (35/185) Rebasing (36/185) Rebasing (37/185) Rebasing (38/185) Rebasing (39/185) Rebasing (40/185) Rebasing (41/185) Rebasing (42/185) Rebasing (43/185) Rebasing (44/185) Rebasing (45/185) Rebasing (46/185) Rebasing (47/185) Rebasing (48/185) Rebasing (49/185) Rebasing (50/185) Rebasing (51/185) Rebasing (52/185) Rebasing (53/185) Rebasing (54/185) Rebasing (55/185) Rebasing (56/185) Rebasing (57/185) Rebasing (58/185) Rebasing (59/185) Rebasing (60/185) Rebasing (61/185) Rebasing (62/185) Rebasing (63/185) Rebasing (64/185) Rebasing (65/185) Rebasing (66/185) Rebasing (67/185) Rebasing (68/185) Rebasing (69/185) Rebasing (70/185) Rebasing (71/185) Rebasing (72/185) Rebasing (73/185) Rebasing (74/185) Rebasing (75/185) Rebasing (76/185) Rebasing (77/185) Rebasing (78/185) Rebasing (79/185) Rebasing (80/185) Rebasing (81/185) Rebasing (82/185) Rebasing (83/185) Rebasing (84/185) Rebasing (85/185) Rebasing (86/185) Rebasing (87/185) Rebasing (88/185) Rebasing (89/185) Rebasing (90/185) Rebasing (91/185) Rebasing (92/185) Rebasing (93/185) Rebasing (94/185) Rebasing (95/185) Rebasing (96/185) Rebasing (97/185) Rebasing (98/185) Rebasing (99/185) Rebasing (100/185) Rebasing (101/185) Rebasing (102/185) Rebasing (103/185) Rebasing (104/185) Rebasing (105/185) Rebasing (106/185) Rebasing (107/185) Rebasing (108/185) Rebasing (109/185) Rebasing (110/185) Rebasing (111/185) Rebasing (112/185) Rebasing (113/185) Rebasing (114/185) Rebasing (115/185) Rebasing (116/185) Rebasing (117/185) Rebasing (118/185) Rebasing (119/185) Rebasing (120/185) Rebasing (121/185) Rebasing (122/185) Rebasing (123/185) Rebasing (124/185) Rebasing (125/185) Rebasing (126/185) Rebasing (127/185) Rebasing (128/185) Rebasing (129/185) Rebasing (130/185) Rebasing (131/185) Rebasing (132/185) Rebasing (133/185) Rebasing (134/185) Rebasing (135/185) Rebasing (136/185) Rebasing (137/185) Rebasing (138/185) Rebasing (139/185) Rebasing (140/185) Rebasing (141/185) Rebasing (142/185) Rebasing (143/185) Rebasing (144/185) Rebasing (145/185) Rebasing (146/185) Rebasing (147/185) Rebasing (148/185) Rebasing (149/185) Rebasing (150/185) Rebasing (151/185) Rebasing (152/185) Rebasing (153/185) Rebasing (154/185) Rebasing (155/185) Rebasing (156/185) Rebasing (157/185) Rebasing (158/185) Rebasing (159/185) Rebasing (160/185) Rebasing (161/185) Rebasing (162/185) Rebasing (163/185) Rebasing (164/185) Rebasing (165/185) Rebasing (166/185) Rebasing (167/185) Rebasing (168/185) Rebasing (169/185) Rebasing (170/185) Rebasing (171/185) Rebasing (172/185) Rebasing (173/185) Rebasing (174/185) Rebasing (175/185) Rebasing (176/185) Rebasing (177/185) Rebasing (178/185) Rebasing (179/185) Rebasing (180/185) Rebasing (181/185) Rebasing (182/185) Rebasing (183/185) Rebasing (184/185) Rebasing (185/185) error: could not apply a769402e3b8e7... Bug 1827782 - [wpt-sync] Update web-platform-tests to e27d35c6a232f7de611ad3dbf0d97fc4a11179b8, 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 a769402e3b8e7... Bug 1827782 - [wpt-sync] Update web-platform-tests to e27d35c6a232f7de611ad3dbf0d97fc4a11179b8, a=testonly'
Rebasing onto latest gecko failed: Cmd('git') failed due to: exit code(1) cmdline: git rebase 223d5f19a8228c71a732862188e41a0b5a9ccb9c stdout: 'CONFLICT (modify/delete): testing/web-platform/meta/fetch/local-network-access/service-worker-background-fetch.https.window.js.ini deleted in HEAD and modified in ac9cb62b14167 (Bug 1827782 - [wpt-sync] Update web-platform-tests to e27d35c6a232f7de611ad3dbf0d97fc4a11179b8, a=testonly). Version ac9cb62b14167 (Bug 1827782 - [wpt-sync] Update web-platform-tests to e27d35c6a232f7de611ad3dbf0d97fc4a11179b8, a=testonly) of testing/web-platform/meta/fetch/local-network-access/service-worker-background-fetch.https.window.js.ini left in tree. CONFLICT (modify/delete): testing/web-platform/meta/fetch/local-network-access/service-worker-fetch.https.window.js.ini deleted in HEAD and modified in ac9cb62b14167 (Bug 1827782 - [wpt-sync] Update web-platform-tests to e27d35c6a232f7de611ad3dbf0d97fc4a11179b8, a=testonly). Version ac9cb62b14167 (Bug 1827782 - [wpt-sync] Update web-platform-tests to e27d35c6a232f7de611ad3dbf0d97fc4a11179b8, a=testonly) of testing/web-platform/meta/fetch/local-network-access/service-worker-fetch.https.window.js.ini left in tree. CONFLICT (modify/delete): testing/web-platform/meta/fetch/local-network-access/service-worker-update.https.window.js.ini deleted in HEAD and modified in ac9cb62b14167 (Bug 1827782 - [wpt-sync] Update web-platform-tests to e27d35c6a232f7de611ad3dbf0d97fc4a11179b8, a=testonly). Version ac9cb62b14167 (Bug 1827782 - [wpt-sync] Update web-platform-tests to e27d35c6a232f7de611ad3dbf0d97fc4a11179b8, a=testonly) of testing/web-platform/meta/fetch/local-network-access/service-worker-update.https.window.js.ini left in tree. Auto-merging testing/web-platform/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-204-fragment.html.ini CONFLICT (content): Merge conflict in testing/web-platform/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-204-fragment.html.ini Auto-merging testing/web-platform/meta/html/browsers/history/the-history-interface/traverse-during-unload.html.ini CONFLICT (content): Merge conflict in testing/web-platform/meta/html/browsers/history/the-history-interface/traverse-during-unload.html.ini' stderr: 'warning: skipped previously applied commit 919e862a04213 warning: skipped previously applied commit 8eb97b431f8de warning: skipped previously applied commit 7d172e55a1683 warning: skipped previously applied commit 882a096d68762 warning: skipped previously applied commit 5e2c0532b0a0d warning: skipped previously applied commit 61579215ccff5 warning: skipped previously applied commit c9f3de48cce11 warning: skipped previously applied commit d7e1485d810c0 warning: skipped previously applied commit 693668c4d68ac warning: skipped previously applied commit 0fff77b786000 warning: skipped previously applied commit 4f3be96ce943a warning: skipped previously applied commit 250c6a67cfc5e warning: skipped previously applied commit b7a73a36f14d0 warning: skipped previously applied commit e5aa8d9839cc7 warning: skipped previously applied commit fd3049dc57135 warning: skipped previously applied commit 755a40e101797 warning: skipped previously applied commit d6b832a25e617 warning: skipped previously applied commit c068373f93329 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/185) Rebasing (2/185) Rebasing (3/185) Rebasing (4/185) Rebasing (5/185) Rebasing (6/185) Rebasing (7/185) Rebasing (8/185) Rebasing (9/185) Rebasing (10/185) Rebasing (11/185) Rebasing (12/185) Rebasing (13/185) Rebasing (14/185) Rebasing (15/185) Rebasing (16/185) Rebasing (17/185) Rebasing (18/185) Rebasing (19/185) Rebasing (20/185) Rebasing (21/185) Rebasing (22/185) Rebasing (23/185) Rebasing (24/185) Rebasing (25/185) Rebasing (26/185) Rebasing (27/185) Rebasing (28/185) Rebasing (29/185) Rebasing (30/185) Rebasing (31/185) Rebasing (32/185) Rebasing (33/185) Rebasing (34/185) Rebasing (35/185) Rebasing (36/185) Rebasing (37/185) Rebasing (38/185) Rebasing (39/185) Rebasing (40/185) Rebasing (41/185) Rebasing (42/185) Rebasing (43/185) Rebasing (44/185) Rebasing (45/185) Rebasing (46/185) Rebasing (47/185) Rebasing (48/185) Rebasing (49/185) Rebasing (50/185) Rebasing (51/185) Rebasing (52/185) Rebasing (53/185) Rebasing (54/185) Rebasing (55/185) Rebasing (56/185) Rebasing (57/185) Rebasing (58/185) Rebasing (59/185) Rebasing (60/185) Rebasing (61/185) Rebasing (62/185) Rebasing (63/185) Rebasing (64/185) Rebasing (65/185) Rebasing (66/185) Rebasing (67/185) Rebasing (68/185) Rebasing (69/185) Rebasing (70/185) Rebasing (71/185) Rebasing (72/185) Rebasing (73/185) Rebasing (74/185) Rebasing (75/185) Rebasing (76/185) Rebasing (77/185) Rebasing (78/185) Rebasing (79/185) Rebasing (80/185) Rebasing (81/185) Rebasing (82/185) Rebasing (83/185) Rebasing (84/185) Rebasing (85/185) Rebasing (86/185) Rebasing (87/185) Rebasing (88/185) Rebasing (89/185) Rebasing (90/185) Rebasing (91/185) Rebasing (92/185) Rebasing (93/185) Rebasing (94/185) Rebasing (95/185) Rebasing (96/185) Rebasing (97/185) Rebasing (98/185) Rebasing (99/185) Rebasing (100/185) Rebasing (101/185) Rebasing (102/185) Rebasing (103/185) Rebasing (104/185) Rebasing (105/185) Rebasing (106/185) Rebasing (107/185) Rebasing (108/185) Rebasing (109/185) Rebasing (110/185) Rebasing (111/185) Rebasing (112/185) Rebasing (113/185) Rebasing (114/185) Rebasing (115/185) Rebasing (116/185) Rebasing (117/185) Rebasing (118/185) Rebasing (119/185) Rebasing (120/185) Rebasing (121/185) Rebasing (122/185) Rebasing (123/185) Rebasing (124/185) Rebasing (125/185) Rebasing (126/185) Rebasing (127/185) Rebasing (128/185) Rebasing (129/185) Rebasing (130/185) Rebasing (131/185) Rebasing (132/185) Rebasing (133/185) Rebasing (134/185) Rebasing (135/185) Rebasing (136/185) Rebasing (137/185) Rebasing (138/185) Rebasing (139/185) Rebasing (140/185) Rebasing (141/185) Rebasing (142/185) Rebasing (143/185) Rebasing (144/185) Rebasing (145/185) Rebasing (146/185) Rebasing (147/185) Rebasing (148/185) Rebasing (149/185) Rebasing (150/185) Rebasing (151/185) Rebasing (152/185) Rebasing (153/185) Rebasing (154/185) Rebasing (155/185) Rebasing (156/185) Rebasing (157/185) Rebasing (158/185) Rebasing (159/185) Rebasing (160/185) Rebasing (161/185) Rebasing (162/185) Rebasing (163/185) Rebasing (164/185) Rebasing (165/185) Rebasing (166/185) Rebasing (167/185) Rebasing (168/185) Rebasing (169/185) Rebasing (170/185) Rebasing (171/185) Rebasing (172/185) Rebasing (173/185) Rebasing (174/185) Rebasing (175/185) Rebasing (176/185) Rebasing (177/185) Rebasing (178/185) Rebasing (179/185) Rebasing (180/185) Rebasing (181/185) Rebasing (182/185) Rebasing (183/185) Rebasing (184/185) Rebasing (185/185) error: could not apply ac9cb62b14167... Bug 1827782 - [wpt-sync] Update web-platform-tests to e27d35c6a232f7de611ad3dbf0d97fc4a11179b8, 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 ac9cb62b14167... Bug 1827782 - [wpt-sync] Update web-platform-tests to e27d35c6a232f7de611ad3dbf0d97fc4a11179b8, a=testonly'
Pushed by wptsync@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/2e2638b00bd3 [wpt-sync] Update web-platform-tests to e27d35c6a232f7de611ad3dbf0d97fc4a11179b8, a=testonly
Status: NEW → RESOLVED
Closed: 3 years ago
Resolution: --- → FIXED
Target Milestone: --- → 114 Branch
Whiteboard: [wptsync landing error] → [wptsync landing]
Regressions: 1828261
Regressions: 1828262
Regressions: 1827817
Regressions: 1805227
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: