Skip to content

Fix duplicates after merge in addedTypes.json #836

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

Merged
merged 2 commits into from
Mar 17, 2020

Conversation

IllusionMH
Copy link
Contributor

@IllusionMH IllusionMH commented Mar 17, 2020

Noticed that there are problems with in addedTypes.json (thanks VS Code!) which were related to duplicated entries in interfaces > interface.

I've removed blocks with cloneNode and re-run patched helper script to bring them back to existing nodes.

Updated baselines should now contain proper overrides and elements names that were skipped because of duplicated keys later in JSON.

Related to #811

@IllusionMH IllusionMH requested a review from sandersn as a code owner March 17, 2020 23:07
Copy link
Member

@sandersn sandersn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One question before I merge. Thanks for checking up on this!

@@ -3700,19 +3685,6 @@
}
}
},
"HTMLVideoElement": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see an existing entry where this HTMLVideoElement method is added. Was that an incorrect artifact of the merge too?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was confused at first, but looks like you've added it by hand after problematic merge.
#811 (comment)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sandersn sandersn merged commit dd663a8 into microsoft:master Mar 17, 2020
@IllusionMH
Copy link
Contributor Author

Thanks for the review!

I think that at this point all cloneNode types are in place, however it's hard to tell if anything from master was affected by merge :(

@IllusionMH IllusionMH deleted the fix-addedTypes-duplicates branch March 18, 2020 09:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants