aboutsummaryrefslogtreecommitdiffstats
path: root/src/google
diff options
context:
space:
mode:
authorUlas Kirazci <ulas@google.com>2013-10-04 19:56:49 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-10-04 19:56:49 +0000
commit9827c718c45cfa1744a3b0f8fc27dac9cd415603 (patch)
tree32848bf011dd0b095e8f3403366faf83387f1b4a /src/google
parent44dc2f1eaead8d95d3f5a4f80f9da87852053bfb (diff)
parent37ac79028de3d1cd8c215ba54fdf31e4eeca4b2c (diff)
downloadexternal_protobuf-9827c718c45cfa1744a3b0f8fc27dac9cd415603.zip
external_protobuf-9827c718c45cfa1744a3b0f8fc27dac9cd415603.tar.gz
external_protobuf-9827c718c45cfa1744a3b0f8fc27dac9cd415603.tar.bz2
Merge "Fix roundtrip failure with groups when unknown fields are enabled."
Diffstat (limited to 'src/google')
-rw-r--r--src/google/protobuf/unittest_extension_nano.proto6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/google/protobuf/unittest_extension_nano.proto b/src/google/protobuf/unittest_extension_nano.proto
index f2906f0..104cfa7 100644
--- a/src/google/protobuf/unittest_extension_nano.proto
+++ b/src/google/protobuf/unittest_extension_nano.proto
@@ -42,3 +42,9 @@ message ContainerMessage {
optional bool another_thing = 100;
}
}
+
+message MessageWithGroup {
+ optional group Group = 1 {
+ optional int32 a = 2;
+ }
+}