chrome/browser/sync/engine/process_commit_response_command.cc - Issue 9305001: sync: Remove the remaining conflict sets code

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

Issue 9305001: sync: Remove the remaining conflict sets code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove failing assertion. Created 8 years, 10 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/process_commit_response_command.cc

diff --git a/chrome/browser/sync/engine/process_commit_response_command.cc b/chrome/browser/sync/engine/process_commit_response_command.cc

index 536db0e098bb4f680461e181d1fb9d773890538a..6135ef6c34a878a01ead9af2fcc8b9a68671367b 100644

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

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

@@ -165,7 +165,7 @@ SyncerError ProcessCommitResponseCommand::ProcessCommitResponse(

case CommitResponse::CONFLICT:

++conflicting_commits;

// Only server CONFLICT responses will activate conflict resolution.

- conflict_progress->AddConflictingItemById(

+ conflict_progress->AddServerConflictingItemById(

status->GetCommitIdAt(proj[i]));

break;

case CommitResponse::SUCCESS: