sync/engine/syncer.cc - Issue 10523003: Refactor following sync commit loop change

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/syncer.cc

Issue 10523003: Refactor following sync commit loop change (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Another rebase Created 8 years, 6 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/syncer.cc

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

index f8639c0f47be6da50db9dd65e9510e393c42ef1e..1a299db5e27c03f26753aa3e26ab4467db99ed51 100644

--- a/sync/engine/syncer.cc

+++ b/sync/engine/syncer.cc

@@ -182,7 +182,8 @@ void Syncer::SyncShare(sessions::SyncSession* session,

break;

}

case COMMIT: {

- BuildAndPostCommits(this, session);

+ session->mutable_status_controller()->set_commit_result(

+ BuildAndPostCommits(this, session));

next_step = RESOLVE_CONFLICTS;

break;

}

« no previous file with comments | « sync/engine/process_commit_response_command.cc ('k') | sync/engine/syncer_unittest.cc » ('j') | no next file with comments »