sync/engine/process_updates_command.cc - Issue 10389103: Sync: Clear IS_UNSYNCED for deleted local items

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: sync/engine/process_updates_command.cc

Issue 10389103: Sync: Clear IS_UNSYNCED for deleted local items (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix check_deps issue by moving ChangeEntryIDAndUpdateChildren Created 8 years, 7 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: sync/engine/process_updates_command.cc

diff --git a/sync/engine/process_updates_command.cc b/sync/engine/process_updates_command.cc

index 72628311dfdeaec05c01b74d92e5959d121d0777..59c1d7747bcf9dd2c125e1b5ca170a0c810ec486 100644

--- a/sync/engine/process_updates_command.cc

+++ b/sync/engine/process_updates_command.cc

@@ -120,8 +120,7 @@ ServerUpdateProcessingResult ProcessUpdatesCommand::ProcessUpdate(

// change the ID now, after we're sure that the update can succeed.

if (local_id != server_id) {

DCHECK(!update.deleted());

- SyncerUtil::ChangeEntryIDAndUpdateChildren(trans, &target_entry,

- server_id);

+ ChangeEntryIDAndUpdateChildren(trans, &target_entry, server_id);

// When IDs change, versions become irrelevant. Forcing BASE_VERSION

// to zero would ensure that this update gets applied, but would indicate

// creation or undeletion if it were committed that way. Instead, prefer