OpenGrok
Home
Sort by relevance
Sort by last modified time
Full Search
Definition
Symbol
File Path
History
|
|
Help
Searched
refs:CONFLICT
(Results
1 - 11
of
11
) sorted by null
/external/chromium/chrome/browser/sync/engine/
syncer_types.h
35
CONFLICT
,
127
// by the
conflict
resolver.
update_applicator.cc
74
case
CONFLICT
:
125
update_progress->AddAppliedUpdate(
CONFLICT
, *i);
syncer_util.cc
155
// this update gets targeted at the correct local entry; we expect
conflict
256
VLOG(1) << "Skipping update, returning
conflict
for: " << id
258
return
CONFLICT
;
270
return
CONFLICT
;
276
return
CONFLICT
;
286
return
CONFLICT
;
313
// passphrase. We return
conflict
, even though the
conflict
is with the
321
return
CONFLICT
;
333
// will stay in
conflict
until the user provides a passphrase that lets th
[
all
...]
all_status.cc
88
status_.summary = sync_api::SyncManager::Status::
CONFLICT
;
process_commit_response_command.cc
151
case CommitResponse::
CONFLICT
:
153
// Only server
CONFLICT
responses will activate
conflict
resolution.
240
if (CommitResponse::
CONFLICT
== response) {
241
VLOG(1) << "
Conflict
Committing: " << local_entry;
syncapi.h
674
CONFLICT
,
[
all
...]
/external/chromium/chrome/browser/sync/sessions/
status_controller_unittest.cc
160
status.mutable_update_progress()->AddAppliedUpdate(
CONFLICT
,
session_state.cc
248
LOG(WARNING) << "[BUG] Attempting to merge two identical
conflict
ids.";
333
// Returns true if at least one update application failed due to a
conflict
338
if (it->first ==
CONFLICT
) {
/external/chromium/net/tools/testserver/
chromiumsync.py
770
Commit attempts stop after the first error, returning a
CONFLICT
result
792
reply.response_type = sync_pb2.CommitResponse.
CONFLICT
793
reply.error_message = '
Conflict
.'
[
all
...]
/external/eclipse-basebuilder/basebuilder-3.6.2/org.eclipse.releng.basebuilder/plugins/
org.eclipse.team.core_3.5.100.R36x_v20100825-0800.jar
com.ibm.icu_4.2.1.v20100412.jar
Completed in 220 milliseconds