Lines Matching defs:conflict
326 * Encode tree conflict descriptions into a single string.
332 * conflict victim paths must be siblings.
440 /* get the tree conflict data. */
468 const svn_wc_conflict_description2_t *conflict =
472 if (conflict->kind == svn_wc_conflict_kind_tree)
476 svn_hash_sets(tree_conflicts, child_name, conflict);
882 svn_skel_t *conflict;
885 SVN_ERR(svn_wc__db_read_conflict(&conflict, db, entry_abspath,
890 db, dir_abspath, conflict,
902 conflict, scratch_pool,
924 conflict, scratch_pool,
1898 svn_wc_conflict_description2_t *conflict;
1904 (const svn_wc_conflict_description2_t**)&conflict,
1911 WRITE_ENTRY_ASSERT(conflict->kind == svn_wc_conflict_kind_tree);
1915 if (conflict->reason == svn_wc_conflict_reason_added)
1916 conflict->src_left_version = NULL;
1918 SVN_ERR(svn_wc__serialize_conflict(&new_skel, conflict,
1923 key = svn_dirent_skip_ancestor(root_abspath, conflict->local_abspath);