[Sync] Don't commit items with predecessors/parents in conflict.

chrome/browser/sync/engine/process_commit_response_command.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/engine/process_commit_response_command.h"
 
 #include <cstddef>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 443 matching lines @@
     local_entry->Put(syncable::NON_UNIQUE_NAME, server_name);
   }
 
   // The server has the final say on positioning, so apply the absolute
   // position that it returns.
   if (entry_response.has_position_in_parent()) {
     // The SERVER_ field should already have been written.
     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).GetServerId()
+             << " 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(
         local_entry->Get(PARENT_ID));
     if (!local_entry->PutPredecessor(new_prev)) {
       // TODO(lipalani) : Propagate the error to caller. crbug.com/100444.
       NOTREACHED();
     }
   }
 }
@@ skipping 37 matching lines @@
   // been recursively deleted.
   // TODO(nick): Here, commit_message.deleted() would be more correct than
   // local_entry->Get(IS_DEL).  For example, an item could be renamed, and then
   // deleted during the commit of the rename.  Unit test & fix.
   if (local_entry->Get(IS_DIR) && local_entry->Get(IS_DEL)) {
     deleted_folders->insert(local_entry->Get(ID));
   }
 }
 
 }  // namespace browser_sync