| /external/clang/test/Lexer/ |
| conflict-marker.c | 3 // Test that we recover gracefully from conflict markers left in input files.
6 // diff3 style expected-error@+1 {{version control conflict marker in file}}
15 // normal style expected-error@+1 {{version control conflict marker in file}}
22 // Perforce style expected-error@+1 {{version control conflict marker in file}}
23 >>>> ORIGINAL conflict-marker.c#6
25 ==== THEIRS conflict-marker.c#7
27 ==== YOURS conflict-marker.c
|
| /external/clang/test/ASTMerge/Inputs/ |
| namespace1.cpp | 14 // Merge namespace with conflict
|
| namespace2.cpp | 14 // Merge namespace with conflict
|
| /external/clang/test/Modules/Inputs/Conflicts/ |
| module.map | 4 conflict B, "we just don't like B"
|
| /art/test/073-mismatched-field/ |
| info.txt | 2 compilation) by a static field. The VM is expected to detect the conflict
|
| /dalvik/tests/073-mismatched-field/ |
| info.txt | 2 compilation) by a static field. The VM is expected to detect the conflict
|
| /external/chromium/base/data/valgrind/ |
| DIRECTORY_MOVED | 1 For those who got a merge conflict in this directory on update:
|
| /external/chromium/net/data/valgrind/ |
| DIRECTORY_MOVED | 1 For those who got a merge conflict in this directory on update:
|
| /external/chromium_org/third_party/sqlite/src/test/ |
| conflict.test | 13 # This file implements tests for the conflict resolution extension
16 # $Id: conflict.test,v 1.32 2009/04/30 09:10:38 danielk1977 Exp $
21 ifcapable !conflict {
28 do_test conflict-1.0 {
54 do_test conflict-1.$i {
74 do_test conflict-2.0 {
101 do_test conflict-2.$i {
119 do_test conflict-3.0 {
146 do_test conflict-3.$i {
162 do_test conflict-4.0
[all...] |
| tkt-4a03edc4c8.test | 23 a INTEGER PRIMARY KEY ON CONFLICT REPLACE,
24 b UNIQUE ON CONFLICT FAIL
|
| /ndk/tests/device/test-basic-rtti/ |
| README | 5 libsupc++.a without any kind of conflict, and that the dynamic_cast<>
|
| /external/bison/src/ |
| InadequacyList.c | 39 result->inadequacy.conflict.token = token;
40 result->inadequacy.conflict.actions = actions;
51 bitset_free (node->inadequacy.conflict.actions);
59 if (!bitset_test (self->inadequacy.conflict.actions,
70 return self->inadequacy.conflict.token;
|
| InadequacyList.h | 37 * For a conflict, each rule in the grammar can have at most one contributing
39 * cannot have lookaheads. For a conflict, exactly one shift can contribute.
41 * possible contributions to any conflict. The maximum number of possible
55 chosen in a conflict is a syntax error because of a %nonassoc. */
59 * The description of a conflict. Don't break encapsulation by modifying the
68 } Conflict;
81 Conflict conflict; member in union:InadequacyList::__anon58
101 * \c manifesting_state, the following actions are in conflict on \c token:
129 * \c self (perhaps because \c self isn't a conflict)
[all...] |
| /external/chromium_org/third_party/angle/src/common/ |
| system.h | 7 // system.h: Includes Windows system headers and undefines macros that conflict.
|
| /ndk/tests/device/test-gabi++/ |
| README | 5 libgabi++_static and libgabi++_shared without any kind of conflict, and that
|
| /frameworks/base/docs/html/training/cloudsave/ |
| conflict-res.jd | 11 .conflict {
20 <li><a href="#conflict">Get Notified of Conflicts</a></li>
39 <p>This article describes how to design a robust conflict resolution strategy for
50 to save data to the cloud, the saves might conflict, and you must decide how to
52 your conflict resolution can be, so you must design your data carefully in order
53 to allow your conflict resolution logic to handle each case correctly.</p>
60 <h2 id="conflict">Get Notified of Conflicts</h2>
73 // resolve conflict, then call mAppStateClient.resolveConflict()
79 up to you to implement this conflict resolution logic.</p>
84 the data. Specifically, if the Google Play services application detects a conflict
[all...] |
| /external/chromium_org/chrome/browser/sync_file_system/ |
| conflict_resolution_policy.h | 14 // The service automatically resolves a conflict by choosing the one
|
| sync_operation_type.cc | 24 return "CONFLICT";
|
| local_change_processor.h | 32 // notify the backing RemoteFileSyncService of the existence of conflict
33 // (as the remote service is supposed to maintain a list of conflict files).
|
| /external/llvm/test/Analysis/BasicAA/ |
| 2003-04-22-GEPProblem.ll | 3 ; BasicAA was incorrectly concluding that P1 and P2 didn't conflict!
|
| /ndk/tests/device/test-basic-exceptions/ |
| README | 9 libsupc++.a without any kind of conflict, and that the try / throw / catch
|
| /external/chromium_org/sync/engine/ |
| conflict_resolver.cc | 60 // METRIC simple conflict resolved by merge.
67 // conflict encryption and not attempting to resolve).
151 DVLOG(1) << "Resolving simple conflict, everything matches, ignoring "
158 DVLOG(1) << "Resolving simple conflict, ignoring server encryption "
166 // NOTE: The update application logic assumes that conflict resolution
172 DVLOG(1) << "Resolving simple conflict, overwriting server changes "
178 DVLOG(1) << "Resolving simple conflict, ignoring local changes for: "
186 // Now that we've resolved the conflict, clear the prev server
196 // conflict. Hierarchy conflicts should not be processed by this
206 DVLOG(1) << "Resolving simple conflict, undeleting server entry:
[all...] |
| /frameworks/compile/mclinker/include/mcld/LD/ |
| DiagLayouts.inc | 5 DIAG(warn_rules_check_failed, DiagnosticEngine::Warning, "Illegal section mapping rule: %0 -> %1. (conflict with %2 -> %3)", "Illegal section mapping rule: %0 -> %1. (conflict with %2 -> %3)")
|
| /external/chromium_org/sync/sessions/ |
| status_controller.h | 51 // Various conflict counters.
56 // Aggregate sum of all conflicting items over all conflict types.
81 // Update application and conflict resolution counters.
|
| /art/test/ReferenceMap/ |
| stack_walk_refmap_jni.cc | 194 // 0:[Conflict],1:[Conflict],2:[Conflict],3:[Reference: java.lang.Object],4:[Conflict],5:[Conflict],6:[Conflict],7:[Conflict],8:[Conflict],
198 // 0:[Reference: java.lang.Exception],1:[Reference: java.lang.Object[]],2:[Reference: java.lang.Object],3:[Conflict],4:[32-bit Constant: 2],5:[Unknown],6:[32-bit Constant: 1],7:[Zero],8:[Reference: ReferenceMap],
202 // 0:[Reference: java.lang.Exception],1:[Reference: java.lang.Object[]],2:[Reference: java.lang.Object],3:[Conflict],4:[32-bit Constant: 1],5:[Unknown],6:[32-bit Constant: 1],7:[Zero],8:[Reference: ReferenceMap]
[all...] |
