Closed Bug 1840961 Opened 3 years ago Closed 3 years ago

Update web-platform-tests to 41453f17f71dc87ae64693a9daa87eb2cd0033d4

Categories

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

Product:
Testing
Component:
web-platform-tests
Type:
task

Tracking

(firefox117 fixed)

Status:
RESOLVED FIXED
Milestone:
117 Branch
Tracking Flags:
Tracking Status
firefox117 --- 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 105b27a9ea8c93a2f3aea9f7bb7ffb6b1570ef4f stdout: 'Auto-merging testing/web-platform/meta/html/semantics/popovers/popover-light-dismiss.html.ini CONFLICT (content): Merge conflict in testing/web-platform/meta/html/semantics/popovers/popover-light-dismiss.html.ini' stderr: 'Rebasing (1/46) Rebasing (2/46) Rebasing (3/46) Rebasing (4/46) Rebasing (5/46) Rebasing (6/46) Rebasing (7/46) Rebasing (8/46) Rebasing (9/46) Rebasing (10/46) Rebasing (11/46) Rebasing (12/46) Rebasing (13/46) Rebasing (14/46) Rebasing (15/46) Rebasing (16/46) Rebasing (17/46) Rebasing (18/46) Rebasing (19/46) Rebasing (20/46) Rebasing (21/46) Rebasing (22/46) Rebasing (23/46) Rebasing (24/46) Rebasing (25/46) Rebasing (26/46) Rebasing (27/46) Rebasing (28/46) Rebasing (29/46) Rebasing (30/46) Rebasing (31/46) Rebasing (32/46) Rebasing (33/46) Rebasing (34/46) Rebasing (35/46) Rebasing (36/46) Rebasing (37/46) Rebasing (38/46) Rebasing (39/46) Rebasing (40/46) Rebasing (41/46) Rebasing (42/46) Rebasing (43/46) Rebasing (44/46) Rebasing (45/46) Rebasing (46/46) error: could not apply df5aadf802912... Bug 1840961 - [wpt-sync] Update web-platform-tests to 41453f17f71dc87ae64693a9daa87eb2cd0033d4, 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 df5aadf802912... Bug 1840961 - [wpt-sync] Update web-platform-tests to 41453f17f71dc87ae64693a9daa87eb2cd0033d4, a=testonly'
Rebasing onto latest gecko failed: Cmd('git') failed due to: exit code(1) cmdline: git rebase e0c75324dfb65ed9baf536a091fde5a4b96e6894 stdout: 'Auto-merging testing/web-platform/meta/css/css-scroll-snap/input/keyboard.html.ini CONFLICT (content): Merge conflict in testing/web-platform/meta/css/css-scroll-snap/input/keyboard.html.ini' stderr: 'Rebasing (1/46) Rebasing (2/46) Rebasing (3/46) Rebasing (4/46) Rebasing (5/46) Rebasing (6/46) Rebasing (7/46) Rebasing (8/46) Rebasing (9/46) Rebasing (10/46) Rebasing (11/46) Rebasing (12/46) Rebasing (13/46) Rebasing (14/46) Rebasing (15/46) Rebasing (16/46) Rebasing (17/46) Rebasing (18/46) Rebasing (19/46) Rebasing (20/46) Rebasing (21/46) Rebasing (22/46) Rebasing (23/46) Rebasing (24/46) Rebasing (25/46) Rebasing (26/46) Rebasing (27/46) Rebasing (28/46) Rebasing (29/46) Rebasing (30/46) Rebasing (31/46) Rebasing (32/46) Rebasing (33/46) Rebasing (34/46) Rebasing (35/46) Rebasing (36/46) Rebasing (37/46) Rebasing (38/46) Rebasing (39/46) Rebasing (40/46) Rebasing (41/46) Rebasing (42/46) Rebasing (43/46) Rebasing (44/46) Rebasing (45/46) Rebasing (46/46) error: could not apply fcd37529ff598... Bug 1840961 - [wpt-sync] Update web-platform-tests to 41453f17f71dc87ae64693a9daa87eb2cd0033d4, 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 fcd37529ff598... Bug 1840961 - [wpt-sync] Update web-platform-tests to 41453f17f71dc87ae64693a9daa87eb2cd0033d4, a=testonly'
Pushed by wptsync@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/ee7f1131329d [wpt-sync] Update web-platform-tests to 41453f17f71dc87ae64693a9daa87eb2cd0033d4, a=testonly

https://hg.mozilla.org/mozilla-central/rev/ee7f1131329d

Status: NEW → RESOLVED
Closed: 3 years ago
status-firefox117: --- → fixed
Resolution: --- → FIXED
Target Milestone: --- → 117 Branch
You need to log in before you can comment on or make changes to this bug.