Ensure component only patches are not lost due to locked tree#3942
Merged
Ensure component only patches are not lost due to locked tree#3942
Conversation
Closes #3941. Possibly related to #3614. When a component-only diff was applied, we did not account for the component being part of a locked tree. Thus, when the tree was unlocked, the component content was unintentionally restored to a previous state. We solve this by checking for a locked tree and applying the patch to that instead.
SteffenDE
added a commit
that referenced
this pull request
Aug 13, 2025
* Ensure component only patches are not lost due to locked tree Closes #3941. Possibly related to #3614. When a component-only diff was applied, we did not account for the component being part of a locked tree. Thus, when the tree was unlocked, the component content was unintentionally restored to a previous state. We solve this by checking for a locked tree and applying the patch to that instead. * link to pr
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #3941. Possibly related to #3614.
When a component-only diff was applied, we did not account for the component being part of a locked tree. Thus, when the tree was unlocked, the component content was unintentionally restored to a previous state.
We solve this by checking for a locked tree and applying the patch to that instead.