-
Notifications
You must be signed in to change notification settings - Fork 3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
easing-tests.js is out of date #15483
Comments
More specifically, there's a section starting at line 44 that includes:
|
It seems the wpt bot didn't upstream the update of |
@jgraham do you have any idea to re-trigger the wpt bot for the patch (https://phabricator.services.mozilla.com/D9309)? |
Yeah, it looks like the sync bot picked up the changes in parts 2 and 8 of that patch series but not part 1: https://github.com/web-platform-tests/wpt/pull/13868/commits There may have been a merge conflict apparently: |
I followed up with @jgraham on this. He suspects a misresolved merge conflict and is going to look into it. |
Fixed by a4bfa25. |
As per web-platform-tests#15483, there was some sort of merge conflict that meant that part 1 of [Mozilla bug 1496619](https://bugzilla.mozilla.org/show_bug.cgi?id=1496619) did not get properly merged to web-platform-tests. PR web-platform-tests#15587 attempted to fix this but failed to delete two files in css-timing that were deleted in this changeset: https://hg.mozilla.org/mozilla-central/rev/b46aa2883e42
As per #15483, there was some sort of merge conflict that meant that part 1 of [Mozilla bug 1496619](https://bugzilla.mozilla.org/show_bug.cgi?id=1496619) did not get properly merged to web-platform-tests. PR #15587 attempted to fix this but failed to delete two files in css-timing that were deleted in this changeset: https://hg.mozilla.org/mozilla-central/rev/b46aa2883e42
As per #15483, there was some sort of merge conflict that meant that part 1 of [Mozilla bug 1496619](https://bugzilla.mozilla.org/show_bug.cgi?id=1496619) did not get properly merged to web-platform-tests. PR #15587 attempted to fix this but failed to delete two files in css-timing that were deleted in this changeset: https://hg.mozilla.org/mozilla-central/rev/b46aa2883e42
Looking at easing-tests.js in wpt, moz, and chromium, it seems that mozilla's is more recent than the others. It seems to have been updated in https://phabricator.services.mozilla.com/D9309 but those changes weren't upstreamed.
@birtles, @BorisChiou can you advise?
The text was updated successfully, but these errors were encountered: