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

chrome/browser/sync/engine/build_commit_command.cc

Index: chrome/browser/sync/engine/build_commit_command.cc
diff --git a/chrome/browser/sync/engine/build_commit_command.cc b/chrome/browser/sync/engine/build_commit_command.cc
index 35ff047afc5be25930bafd8322484c264c496f2d..6df9dbe969c21b637eb36f3d63a64a27732b5808 100644
--- a/chrome/browser/sync/engine/build_commit_command.cc
+++ b/chrome/browser/sync/engine/build_commit_command.cc
@@ -204,6 +204,11 @@ void BuildCommitCommand::ExecuteImpl(SyncSession* session) {
 
         position_map[id] = position_block;
         sync_entry->set_position_in_parent(position_block.first);
+        DVLOG(1) << "Setting server position for entry "
+                 << meta_entry.Get(syncable::ID).GetServerId()
+                 << " from "
+                 << meta_entry.Get(syncable::SERVER_POSITION_IN_PARENT)
+                 << " to " << position_block.first;
       }
       SetEntrySpecifics(&meta_entry, sync_entry);
     }