third_party/protobuf/java/core/src/test/proto/com/google/protobuf/field_presence_test.proto - Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/java/core/src/test/proto/com/google/protobuf/field_presence_test.proto

Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)" (Closed)

Patch Set: Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/java/core/src/test/java/com/google/protobuf/WireFormatTest.java ('k') | third_party/protobuf/java/core/src/test/proto/com/google/protobuf/map_for_proto2_lite_test.proto » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/java/core/src/test/proto/com/google/protobuf/field_presence_test.proto

diff --git a/third_party/protobuf/java/core/src/test/proto/com/google/protobuf/field_presence_test.proto b/third_party/protobuf/java/core/src/test/proto/com/google/protobuf/field_presence_test.proto

index 2367bd8bd013690cd0703573969ac5b89a36d28e..8f3ca8c61057973f1b9ec11d931ac33f55a447dd 100644

--- a/third_party/protobuf/java/core/src/test/proto/com/google/protobuf/field_presence_test.proto

+++ b/third_party/protobuf/java/core/src/test/proto/com/google/protobuf/field_presence_test.proto

@@ -36,6 +36,7 @@ import "google/protobuf/unittest.proto";

option java_package = "com.google.protobuf";

option java_outer_classname = "FieldPresenceTestProto";

+option java_generate_equals_and_hash = true;

message TestAllTypes {

enum NestedEnum {

@@ -53,7 +54,6 @@ message TestAllTypes {

NestedEnum optional_nested_enum = 4;

NestedMessage optional_nested_message = 5;

protobuf_unittest.TestRequired optional_proto2_message = 6;

- NestedMessage optional_lazy_message = 7 [lazy=true];

oneof oneof_field {

int32 oneof_int32 = 11;

@@ -81,7 +81,6 @@ message TestOptionalFieldsOnly {

TestAllTypes.NestedEnum optional_nested_enum = 4;

TestAllTypes.NestedMessage optional_nested_message = 5;

protobuf_unittest.TestRequired optional_proto2_message = 6;

- TestAllTypes.NestedMessage optional_lazy_message = 7 [lazy=true];

}

message TestRepeatedFieldsOnly {