Fix protobuf merge when types have different descriptor instances #526
+149
−55
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.
When two proto messages have different descriptor instances it's not possible
to merge from one proto to the other without raising a
panic
. The fallback strategyis to merge using the
proto.Marshal
andproto.Unmarshal
calls to serialize to bytesfirst.
The existing
proto.Merge
semantics might benefit from relaxing their constraints,but I can see how in some cases the merge result might be undefined.