sync/internal_api/write_node.cc - Issue 1842653006: Update //third_party/protobuf to version 3.

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: sync/internal_api/write_node.cc

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge Created 4 years, 8 months ago

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

Jump to:

Index: sync/internal_api/write_node.cc

diff --git a/sync/internal_api/write_node.cc b/sync/internal_api/write_node.cc

index 0f57315122004a3a470ec2156c3c7c8a40938948..e11c88e3ada409a60efc3689eea714e9faf8298e 100644

--- a/sync/internal_api/write_node.cc

+++ b/sync/internal_api/write_node.cc

@@ -163,8 +163,8 @@ void WriteNode::SetEntitySpecifics(

const sync_pb::EntitySpecifics& old_specifics = entry_->GetSpecifics();

sync_pb::EntitySpecifics new_specifics;

new_specifics.CopyFrom(new_value);

- new_specifics.mutable_unknown_fields()->MergeFrom(

- old_specifics.unknown_fields());

+ new_specifics.mutable_unknown_fields()

+ ->append(old_specifics.unknown_fields());

// Will update the entry if encryption was necessary.

if (!UpdateEntryWithEncryption(GetTransaction()->GetWrappedTrans(),

« no previous file with comments | « sync/internal_api/sync_manager_impl_unittest.cc ('k') | third_party/protobuf/.gitignore » ('j') | no next file with comments »