Lines Matching full:conflict
613 // Server side change will put A in conflict.
632 // In conflict but properly encrypted.
638 // Not in conflict and properly encrypted.
660 // as a simple conflict, but still be unsynced until the next sync cycle.
673 // conflicting, but last sync cycle resolved it as simple conflict, so on
1596 // Id 3 should be in conflict now.
1621 // The name clash should also still be in conflict.
1640 << "child of unknown parent should be in conflict";
1645 << "grandchild of unknown parent should be in conflict";
1650 << "great-grandchild of unknown parent should be in conflict";
1657 // Moving 5 under 6 will create a cycle: a conflict.
1705 << "circular move should be in conflict";
2128 * the client and the server, the conflict resolver should just drop one of
2157 // We expect the conflict resolver to preserve the local entry.
2509 // Test that a single conflict response from the server will cause us to exit
2527 // Return a CONFLICT response for the first item.
2685 // Check they're in the expected conflict state.
2787 // be no conflict with that, since names are not unique.
2857 // be no conflict with that, since names are not unique.
2964 // When we undelete an entity as a result of conflict resolution, we reuse the
3122 // Merge conflict resolution will merge a new local entry with another entry
3157 // We should never be stuck (conflict resolution shouldn't
3735 // metahandle; client should have won the conflict resolution.
3755 // metahandle; client should have won the conflict resolution.
4085 // updates, otherwise we risk causing a server-side conflict.
4404 // None of this should trigger any conflict detection -- it is perfectly
