Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(353)

Unified Diff: sync/engine/commit.cc

Issue 10687008: Merge 144339 - sync: Set explicit protocol_version on commit (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180_11/src/
Patch Set: Created 8 years, 6 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sync/test/engine/mock_connection_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/commit.cc
===================================================================
--- sync/engine/commit.cc (revision 144340)
+++ sync/engine/commit.cc (working copy)
@@ -68,6 +68,9 @@
commit_set->Clear();
commit_message->Clear();
+ // TODO(134769): This is a temporary fix for crbug.com/134715.
+ commit_message->set_protocol_version(commit_message->protocol_version());
+
WriteTransaction trans(FROM_HERE, SYNCER, session->context()->directory());
sessions::ScopedSetSessionWriteTransaction set_trans(session, &trans);
« no previous file with comments | « no previous file | sync/test/engine/mock_connection_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698