Skip to content

test(transformer): fix merging options in fixtures update script#7712

Merged
graphite-app[bot] merged 1 commit intomainfrom
12-06-test_transformer_fix_merging_options_in_fixtures_update_script
Dec 8, 2024
Merged

test(transformer): fix merging options in fixtures update script#7712
graphite-app[bot] merged 1 commit intomainfrom
12-06-test_transformer_fix_merging_options_in_fixtures_update_script

Conversation

@overlookmotel
Copy link
Member

@overlookmotel overlookmotel commented Dec 6, 2024

Fix how options are merged with options from parent folder(s). It's much simpler than I had thought. If folder's options contains plugins, that overwrites plugins from parent options. They don't get merged.

@graphite-app
Copy link
Contributor

graphite-app bot commented Dec 6, 2024

Your org has enabled the Graphite merge queue for merging into main

Add the label “0-merge” to the PR and Graphite will automatically add it to the merge queue when it’s ready to merge. Or use the label “hotfix” to add to the merge queue as a hot fix.

You must have a Graphite account and log in to Graphite in order to use the merge queue. Sign up using this link.

@github-actions github-actions bot added A-transformer Area - Transformer / Transpiler C-test Category - Testing. Code is missing test cases, or a PR is adding them labels Dec 6, 2024
@overlookmotel overlookmotel marked this pull request as ready for review December 6, 2024 20:54
@overlookmotel overlookmotel force-pushed the 12-06-test_transformer_fix_merging_options_in_fixtures_update_script branch from 80ec827 to 5675ecc Compare December 6, 2024 21:16
@overlookmotel overlookmotel force-pushed the 12-06-refactor_transformer_class-properties_todo_comments_for_future_optimizations branch from ccfeb68 to 6867567 Compare December 7, 2024 19:00
@overlookmotel overlookmotel force-pushed the 12-06-test_transformer_fix_merging_options_in_fixtures_update_script branch from 5675ecc to d2e686a Compare December 7, 2024 19:00
@graphite-app graphite-app bot added the 0-merge Merge with Graphite Merge Queue label Dec 8, 2024
@graphite-app
Copy link
Contributor

graphite-app bot commented Dec 8, 2024

Merge activity

Fix how options are merged with options from parent folder(s). It's much simpler than I had thought. If folder's options contains `plugins`, that overwrites `plugins` from parent options. They don't get merged.
@Dunqing Dunqing force-pushed the 12-06-refactor_transformer_class-properties_todo_comments_for_future_optimizations branch from 6867567 to 7344d21 Compare December 8, 2024 01:45
@Dunqing Dunqing force-pushed the 12-06-test_transformer_fix_merging_options_in_fixtures_update_script branch from d2e686a to 34a8d91 Compare December 8, 2024 01:46
Base automatically changed from 12-06-refactor_transformer_class-properties_todo_comments_for_future_optimizations to main December 8, 2024 02:14
@graphite-app graphite-app bot merged commit 34a8d91 into main Dec 8, 2024
@graphite-app graphite-app bot deleted the 12-06-test_transformer_fix_merging_options_in_fixtures_update_script branch December 8, 2024 02:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0-merge Merge with Graphite Merge Queue A-transformer Area - Transformer / Transpiler C-test Category - Testing. Code is missing test cases, or a PR is adding them

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant