chrome/browser/sync/sessions/session_state.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/sessions/session_state.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: Ensure we clear BASE_SERVER_SPECIFICS Created 9 years 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/sessions/session_state.cc

diff --git a/chrome/browser/sync/sessions/session_state.cc b/chrome/browser/sync/sessions/session_state.cc

index 19f880c0a6369de40ba0b50f0264d03da35a798b..5e1f252034e401fbc930aca4cb74345243e83da8 100644

--- a/chrome/browser/sync/sessions/session_state.cc

+++ b/chrome/browser/sync/sessions/session_state.cc

@@ -187,6 +187,11 @@ ConflictProgress::~ConflictProgress() {

CleanupSets();

}

+bool ConflictProgress::HasSimpleConflictItem(const syncable::Id& id) const {

+ return conflicting_item_ids_.count(id) > 0 &&

+ (IdToConflictSetFind(id) == IdToConflictSetEnd());

IdToConflictSetMap::const_iterator ConflictProgress::IdToConflictSetFind(

const syncable::Id& the_id) const {

return id_to_conflict_set_.find(the_id);