sync/protocol/sync.proto - Issue 905853002: Sync commit errors should temporarily re-enable trigger pre-commit getupdates

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/protocol/sync.proto

Issue 905853002: Sync commit errors should temporarily re-enable trigger pre-commit getupdates (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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:

View side-by-side diff with in-line comments

Download patch

Index: sync/protocol/sync.proto

diff --git a/sync/protocol/sync.proto b/sync/protocol/sync.proto

index df302e3f213aea19184afa60b7fb1dd80f5b15cb..1db6587252311b49b973c2405ad5c8489ba0de90 100644

--- a/sync/protocol/sync.proto

+++ b/sync/protocol/sync.proto

@@ -492,6 +492,13 @@ message GetUpdateTriggers {

// Introduced in M38.

optional bool initial_sync_in_progress = 7;

+ // This flag is set if this GetUpdate request is due to client receive

Nicolas Zea 2015/02/06 22:37:01 couple grammar nits: "receive" -> "receiving", "so

Gang Wu 2015/02/06 22:58:19 Done.

+ // conflict response from server, so client need to sync and then resolve

+ // conflict locally, and then commit again.

+ //

+ // Introduced in M41.

Nicolas Zea 2015/02/06 22:37:01 This should be m42, 41 has already been cut.

Gang Wu 2015/02/06 22:58:19 Done.

+ optional bool sync_for_resolve_conflict_in_progress = 8;

}

message GarbageCollectionDirective {

« sync/engine/syncer_unittest.cc ('K') | « sync/engine/syncer_unittest.cc ('k') | sync/sessions/data_type_tracker.h » ('j') | sync/sessions/data_type_tracker.h » ('J')