diff options
| author |  Paul Yang <TeBoring@users.noreply.github.com> | 2017-03-01 10:39:48 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-03-01 10:39:48 -0800 |
| commit | bcbaabe53a8d661f5a473d2a157a4278ad8bf579 (patch) | |
| tree | 173e7e07319f10451e2ec290c00cba89a34b647e /php/tests/proto | |
| parent | 7339fc04c49a055ec0688cd0cb24cf7ea64f7783 (diff) | |
Add mergeFrom method on Message (#2766)
This method merges the contents of the specified message into the
current message. Singular fields that are set in the specified message
overwrite the corresponding fields in the current message. Repeated
fields are appended. Map fields key-value pairs are overritten.
Singular/Oneof sub-messages are recursively merged. All overritten
sub-messages are deep-copied.
Diffstat (limited to 'php/tests/proto')
| -rw-r--r-- | php/tests/proto/test.proto | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/php/tests/proto/test.proto b/php/tests/proto/test.proto index 594aee4d..c971df21 100644 --- a/php/tests/proto/test.proto +++ b/php/tests/proto/test.proto @@ -90,6 +90,7 @@ message TestMessage { message Sub { int32 a = 1; + repeated int32 b = 2; } // Reserved for non-existing field test. |