From cbe250591fca9d2e776776be065a72c5550a5556 Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Tue, 24 Oct 2017 14:14:15 +0100 Subject: Fix merging with message-valued oneof If messages A and B have the same oneof case, which is a message type, and we merge B into A, those sub-messages should be merged. Fixes #3200. Note that I haven't regenerated all the code, as some of the protos have been changed, breaking generation. --- csharp/protos/unittest_issues.proto | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'csharp/protos') diff --git a/csharp/protos/unittest_issues.proto b/csharp/protos/unittest_issues.proto index 6c9f7634..332c81dc 100644 --- a/csharp/protos/unittest_issues.proto +++ b/csharp/protos/unittest_issues.proto @@ -124,3 +124,18 @@ message TestJsonName { string description = 2 [json_name = "desc"]; string guid = 3 [json_name = "exid"]; } + +// Issue 3200: When merging two messages which use the same +// oneof case, which is itself a message type, the submessages should +// be merged. +message OneofMerging { + message Nested { + int32 x = 1; + int32 y = 2; + } + + oneof value { + string text = 1; + Nested nested = 2; + } +} \ No newline at end of file -- cgit v1.2.3