Closed Bug 1944632 Opened 11 months ago Closed 11 months ago

Update web-platform-tests to 034aca802303d13d05478b25e7e87271b3fcb020

Categories

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

task

Tracking

(firefox136 fixed)

RESOLVED FIXED
136 Branch
Tracking Status
firefox136 --- fixed

People

(Reporter: wpt-sync, Unassigned)

References

(Regressed 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.
Rebasing onto latest gecko failed: Cmd('git') failed due to: exit code(1) cmdline: git rebase 1ab7a4ca14b9bcdefca0ba84cd5969885ac90097 stdout: 'Auto-merging testing/web-platform/meta/css/css-text/animations/hyphen-limit-chars-interpolation.html.ini CONFLICT (add/add): Merge conflict in testing/web-platform/meta/css/css-text/animations/hyphen-limit-chars-interpolation.html.ini Auto-merging testing/web-platform/meta/css/css-text/animations/hyphen-no-interpolation.html.ini CONFLICT (add/add): Merge conflict in testing/web-platform/meta/css/css-text/animations/hyphen-no-interpolation.html.ini Auto-merging testing/web-platform/meta/css/css-text/hyphens/hyphenate-limit-chars-001.html.ini CONFLICT (add/add): Merge conflict in testing/web-platform/meta/css/css-text/hyphens/hyphenate-limit-chars-001.html.ini Auto-merging testing/web-platform/meta/css/css-text/parsing/hyphenate-limit-chars-computed.html.ini CONFLICT (add/add): Merge conflict in testing/web-platform/meta/css/css-text/parsing/hyphenate-limit-chars-computed.html.ini Auto-merging testing/web-platform/meta/css/css-text/parsing/hyphenate-limit-chars-valid.html.ini CONFLICT (add/add): Merge conflict in testing/web-platform/meta/css/css-text/parsing/hyphenate-limit-chars-valid.html.ini' stderr: 'Rebasing (1/26) Rebasing (2/26) Rebasing (3/26) Rebasing (4/26) Rebasing (5/26) Rebasing (6/26) Rebasing (7/26) Rebasing (8/26) Rebasing (9/26) Rebasing (10/26) Rebasing (11/26) Rebasing (12/26) Rebasing (13/26) Rebasing (14/26) Rebasing (15/26) Rebasing (16/26) Rebasing (17/26) Rebasing (18/26) Rebasing (19/26) Rebasing (20/26) Rebasing (21/26) Rebasing (22/26) Rebasing (23/26) Rebasing (24/26) Rebasing (25/26) Rebasing (26/26) error: could not apply e8f182e9e5ff7... Bug 1944632 - [wpt-sync] Update web-platform-tests to 034aca802303d13d05478b25e7e87271b3fcb020, 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 e8f182e9e5ff7... Bug 1944632 - [wpt-sync] Update web-platform-tests to 034aca802303d13d05478b25e7e87271b3fcb020, a=testonly'
Pushed by wptsync@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/84ff673e0e8a [wpt-sync] Update web-platform-tests to 034aca802303d13d05478b25e7e87271b3fcb020, a=testonly
Regressions: 1945066
Status: NEW → RESOLVED
Closed: 11 months ago
Resolution: --- → FIXED
Target Milestone: --- → 136 Branch
Whiteboard: [wptsync landing error] → [wptsync landing]
Flags: needinfo?(james)
Flags: needinfo?(aborovova)
You need to log in before you can comment on or make changes to this bug.