chrome/browser/sync/engine/build_commit_command.cc - Issue 8922015: [Sync] Don't commit items with predecessors/parents in conflict.

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: chrome/browser/sync/engine/build_commit_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: More comments. Add racy test case Created 8 years, 11 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: 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 4655827ec31229c8137ac2d4afb5ba2080a1638f..996865f54c822d42dc0ef3c09bc224cd0d5a7260 100644

--- a/chrome/browser/sync/engine/build_commit_command.cc

+++ b/chrome/browser/sync/engine/build_commit_command.cc

@@ -204,6 +204,11 @@ SyncerError 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)

+ << " from "

+ << meta_entry.Get(syncable::SERVER_POSITION_IN_PARENT)

+ << " to " << position_block.first;

}

SetEntrySpecifics(&meta_entry, sync_entry);

}