chrome/browser/sync/engine/syncer_util.h - 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/engine/syncer_util.h

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/engine/syncer_util.h

diff --git a/chrome/browser/sync/engine/syncer_util.h b/chrome/browser/sync/engine/syncer_util.h

index bfcca2706e5103281cd7f95b6e7f89e0e38f1d08..0542c415c391bce8ac78f5c591916058831320d3 100644

--- a/chrome/browser/sync/engine/syncer_util.h

+++ b/chrome/browser/sync/engine/syncer_util.h

@@ -77,8 +77,6 @@ class SyncerUtil {

static void UpdateLocalDataFromServerData(syncable::WriteTransaction* trans,

syncable::MutableEntry* entry);

- static VerifyCommitResult ValidateCommitEntry(syncable::Entry* entry);

static VerifyResult VerifyNewEntry(const SyncEntity& update,

syncable::Entry* target,

const bool deleted);