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

Unified Diff: chrome/browser/sync/engine/process_commit_response_command.cc

Issue 8922015: [Sync] Don't commit items with predecessors/parents in conflict. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ensure we clear BASE_SERVER_SPECIFICS Created 9 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
Index: chrome/browser/sync/engine/process_commit_response_command.cc
diff --git a/chrome/browser/sync/engine/process_commit_response_command.cc b/chrome/browser/sync/engine/process_commit_response_command.cc
index a4c3291e041101184f59b8bb64db0d600eef49c2..bcf726aa204b1077976ced7261ad4ff305611fc9 100644
--- a/chrome/browser/sync/engine/process_commit_response_command.cc
+++ b/chrome/browser/sync/engine/process_commit_response_command.cc
@@ -457,6 +457,12 @@ void ProcessCommitResponseCommand::OverrideClientFieldsAfterCommit(
DCHECK_EQ(entry_response.position_in_parent(),
local_entry->Get(SERVER_POSITION_IN_PARENT));
+ DVLOG(1) << "Response overrides local position of "
+ << local_entry->Get(syncable::ID)
+ << " from "
+ << local_entry->Get(syncable::SERVER_POSITION_IN_PARENT)
+ << " to " << entry_response.position_in_parent();
+
// We just committed successfully, so we assume that the position
// value we got applies to the PARENT_ID we submitted.
syncable::Id new_prev = local_entry->ComputePrevIdFromServerPosition(

Powered by Google App Engine
This is Rietveld 408576698