backend: remove MergedTreeId::Legacy variant
#7764
Merged
Conversation
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
scott2000
force-pushed
the
scott2000/remove-legacy-merged-tree
branch
from
c09ae21 to
f41d655
Compare
yuja
reviewed
Oct 19, 2025
martinvonz
approved these changes
Oct 19, 2025
I'm planning to try to add conflict labels to `MergedTree` and `MergedTreeId`, and it will be easier to add them if both are structs with similar methods. Since we don't support reading/writing legacy conflicts anymore (as far as I'm aware), I think it should be safe to delete the `MergedTreeId::Legacy` variant now.
This is consistent with `MergedTreeId::into_merge`.
scott2000
force-pushed
the
scott2000/remove-legacy-merged-tree
branch
from
f41d655 to
6408973
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
I'm planning to try to add conflict labels to
MergedTreeandMergedTreeId(#7692), and it will be easier to add them if both are structs with similar methods. Since we don't support reading/writing legacy conflicts anymore (as far as I'm aware), I think it should be safe to delete theMergedTreeId::Legacyvariant now.Checklist
If applicable:
CHANGELOG.mdREADME.md,docs/,demos/)cli/src/config-schema.json)