chrome/browser/sync/engine/syncer.cc - Issue 9107055: Remove single direction conflict set 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/syncer.cc

Issue 9107055: Remove single direction conflict set code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Pre-emptive rebase 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/syncer.cc

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

index fe2a49cc09fa16a7b09b2c9d5de79f7ad2ff83e3..dbab2fb224db32cbbf02b46e31fe1d080e43eaee 100644

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

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

@@ -240,10 +240,7 @@ void Syncer::SyncShare(sessions::SyncSession* session,

case BUILD_AND_PROCESS_CONFLICT_SETS: {

BuildAndProcessConflictSetsCommand build_process_conflict_sets;

build_process_conflict_sets.Execute(session);

- if (session->status_controller().conflict_sets_built())

- next_step = SYNCER_END;

- else

- next_step = RESOLVE_CONFLICTS;

+ next_step = RESOLVE_CONFLICTS;

break;

}

case RESOLVE_CONFLICTS: {