FieldMask: finish him#3656
Merged
Merged
Conversation
oldergod
commented
Jul 13, 2026
oldergod
commented
Member
- Preserved Swift recursion depth during merged decoding.
- Correctly merged repeated same-member message oneofs across Java, Kotlin, Swift, and dynamic adapters.
- Deferred Swift proto2 required-field validation until all occurrences are merged.
- Made FieldMask merging linear on JVM and Swift generated paths.
oldergod
force-pushed
the
bquenaudon.2026-07-13.fieldmask_12
branch
from
July 13, 2026 14:00
a375523 to
6fe323e
Compare
- Preserved Swift recursion depth during merged decoding. - Correctly merged repeated same-member message oneofs across Java, Kotlin, Swift, and dynamic adapters. - Deferred Swift proto2 required-field validation until all occurrences are merged. - Made FieldMask merging linear on JVM and Swift generated paths.
oldergod
force-pushed
the
bquenaudon.2026-07-13.fieldmask_12
branch
from
July 14, 2026 11:00
6fe323e to
8c68d05
Compare
oldergod
enabled auto-merge
July 14, 2026 11:00
oldergod
disabled auto-merge
July 14, 2026 12:04
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.