Closed Bug 2071508 Opened 2 months ago Closed 2 months ago

Update web-platform-tests to d9ce49d5f62eb3e3532833b0590ce7d27763556a

Categories

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

task

Tracking

(firefox158 fixed)

RESOLVED FIXED
158 Branch
Tracking Status
firefox158 --- 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 afb5802bb546aeb973d4d3c95efaf3f9e9b26802
stdout: 'CONFLICT (modify/delete): testing/web-platform/meta/css/css-font-loading/fontface-css-connected-descriptors.html.ini deleted in HEAD and modified in aa748ab4c2c75 (Bug 2071508 - [wpt-sync] Update web-platform-tests to d9ce49d5f62eb3e3532833b0590ce7d27763556a, a=testonly). Version aa748ab4c2c75 (Bug 2071508 - [wpt-sync] Update web-platform-tests to d9ce49d5f62eb3e3532833b0590ce7d27763556a, a=testonly) of testing/web-platform/meta/css/css-font-loading/fontface-css-connected-descriptors.html.ini left in tree.
CONFLICT (modify/delete): testing/web-platform/meta/css/css-font-loading/fontfaceset-load-css-wide-keywords.html.ini deleted in HEAD and modified in aa748ab4c2c75 (Bug 2071508 - [wpt-sync] Update web-platform-tests to d9ce49d5f62eb3e3532833b0590ce7d27763556a, a=testonly). Version aa748ab4c2c75 (Bug 2071508 - [wpt-sync] Update web-platform-tests to d9ce49d5f62eb3e3532833b0590ce7d27763556a, a=testonly) of testing/web-platform/meta/css/css-font-loading/fontfaceset-load-css-wide-keywords.html.ini left in tree.
CONFLICT (modify/delete): testing/web-platform/meta/css/css-fonts/parsing/font-family-computed.html.ini deleted in HEAD and modified in aa748ab4c2c75 (Bug 2071508 - [wpt-sync] Update web-platform-tests to d9ce49d5f62eb3e3532833b0590ce7d27763556a, a=testonly). Version aa748ab4c2c75 (Bug 2071508 - [wpt-sync] Update web-platform-tests to d9ce49d5f62eb3e3532833b0590ce7d27763556a, a=testonly) of testing/web-platform/meta/css/css-fonts/parsing/font-family-computed.html.ini left in tree.
CONFLICT (modify/delete): testing/web-platform/meta/css/css-fonts/parsing/font-family-valid.html.ini deleted in HEAD and modified in aa748ab4c2c75 (Bug 2071508 - [wpt-sync] Update web-platform-tests to d9ce49d5f62eb3e3532833b0590ce7d27763556a, a=testonly). Version aa748ab4c2c75 (Bug 2071508 - [wpt-sync] Update web-platform-tests to d9ce49d5f62eb3e3532833b0590ce7d27763556a, a=testonly) of testing/web-platform/meta/css/css-fonts/parsing/font-family-valid.html.ini left in tree.
Auto-merging testing/web-platform/meta/css/css-fonts/variations/font-weight-matching-installed-fonts.html.ini
CONFLICT (content): Merge conflict in testing/web-platform/meta/css/css-fonts/variations/font-weight-matching-installed-fonts.html.ini
Auto-merging testing/web-platform/meta/css/cssom/font-family-serialization-001.html.ini
CONFLICT (content): Merge conflict in testing/web-platform/meta/css/cssom/font-family-serialization-001.html.ini
Auto-merging testing/web-platform/meta/css/cssom/serialize-values.html.ini
CONFLICT (content): Merge conflict in testing/web-platform/meta/css/cssom/serialize-values.html.ini'
stderr: 'Rebasing (1/65)
Rebasing (2/65)
Rebasing (3/65)
Rebasing (4/65)
Rebasing (5/65)
Rebasing (6/65)
Rebasing (7/65)
Rebasing (8/65)
Rebasing (9/65)
Rebasing (10/65)
Rebasing (11/65)
Rebasing (12/65)
Rebasing (13/65)
Rebasing (14/65)
Rebasing (15/65)
Rebasing (16/65)
Rebasing (17/65)
Rebasing (18/65)
Rebasing (19/65)
Rebasing (20/65)
Rebasing (21/65)
Rebasing (22/65)
Rebasing (23/65)
Rebasing (24/65)
Rebasing (25/65)
Rebasing (26/65)
Rebasing (27/65)
Rebasing (28/65)
Rebasing (29/65)
Rebasing (30/65)
Rebasing (31/65)
Rebasing (32/65)
Rebasing (33/65)
Rebasing (34/65)
Rebasing (35/65)
Rebasing (36/65)
Rebasing (37/65)
Rebasing (38/65)
Rebasing (39/65)
Rebasing (40/65)
Rebasing (41/65)
Rebasing (42/65)
Rebasing (43/65)
Rebasing (44/65)
Rebasing (45/65)
Rebasing (46/65)
Rebasing (47/65)
Rebasing (48/65)
Rebasing (49/65)
Rebasing (50/65)
Rebasing (51/65)
Rebasing (52/65)
Rebasing (53/65)
Rebasing (54/65)
Rebasing (55/65)
Rebasing (56/65)
Rebasing (57/65)
Rebasing (58/65)
Rebasing (59/65)
Rebasing (60/65)
Rebasing (61/65)
Rebasing (62/65)
Rebasing (63/65)
Rebasing (64/65)
Rebasing (65/65)
error: could not apply aa748ab4c2c75... Bug 2071508 - [wpt-sync] Update web-platform-tests to d9ce49d5f62eb3e3532833b0590ce7d27763556a, 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 aa748ab4c2c75... Bug 2071508 - [wpt-sync] Update web-platform-tests to d9ce49d5f62eb3e3532833b0590ce7d27763556a, a=testonly'

Pushed by wptsync@mozilla.com: https://github.com/mozilla-firefox/firefox/commit/ef69bff0524f https://hg.mozilla.org/integration/autoland/rev/a3c7985e0072 [wpt-sync] Update web-platform-tests to d9ce49d5f62eb3e3532833b0590ce7d27763556a, a=testonly
Status: NEW → RESOLVED
Closed: 2 months ago
Resolution: --- → FIXED
Target Milestone: --- → 158 Branch
You need to log in before you can comment on or make changes to this bug.