Searched refs:conflict_data (Results 1 - 6 of 6) sorted by relevance

/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
H A Dupgrade.c1163 svn_skel_t *conflict_data = NULL; local
1175 conflict_data = svn_wc__conflict_skel_create(result_pool);
1189 SVN_ERR(svn_wc__conflict_skel_add_text_conflict(conflict_data,
1202 if (!conflict_data)
1203 conflict_data = svn_wc__conflict_skel_create(result_pool);
1207 SVN_ERR(svn_wc__conflict_skel_add_prop_conflict(conflict_data,
1222 if (!conflict_data)
1223 conflict_data = svn_wc__conflict_skel_create(scratch_pool);
1236 SVN_ERR(svn_wc__conflict_skel_add_tree_conflict(conflict_data,
1248 SVN_ERR(svn_wc__conflict_skel_set_op_update(conflict_data,
1291 svn_skel_t *conflict_data; local
[all...]
H A Dwc-queries.sql132 SELECT changelist, properties, conflict_data
173 SELECT local_relpath, changelist, properties, conflict_data
570 INSERT INTO actual_node (wc_id, local_relpath, conflict_data, parent_relpath)
574 UPDATE actual_node SET conflict_data = ?3
747 AND conflict_data IS NULL
759 AND conflict_data IS NULL
829 conflict_data = NULL,
851 conflict_data = NULL,
941 SELECT local_relpath, conflict_data
944 NOT (conflict_data I
[all...]
H A Dwc-metadata.sql145 /* ### These columns will eventually be merged into conflict_data below. */
160 ### This column will eventually be merged into the conflict_data column,
166 conflict_data BLOB,
173 conflict_data as well?
657 UPDATE actual_node SET conflict_data = ?3, conflict_old = NULL,
H A Dentries.c353 write_tree_conflicts(const char **conflict_data,
369 *conflict_data = svn_skel__unparse(skel, pool)->data;
1622 svn_skel_t *conflict_data = NULL;
1638 &conflict_data,
1651 if (conflict_data)
1653 svn_stringbuf_t *data = svn_skel__unparse(conflict_data, scratch_pool);
352 write_tree_conflicts(const char **conflict_data, apr_hash_t *conflicts, apr_pool_t *pool) argument
1621 svn_skel_t *conflict_data = NULL; local
H A Dwc-checks.sql118 OR (a.conflict_data IS NULL AND a.properties IS NULL AND a.changelist IS NULL)
H A Dwc_db.c6664 const void *conflict_data; local
6696 conflict_data = svn_sqlite__column_blob(stmt, 2, &conflict_len,
6701 if (!conflict_data)
6704 conflicts = svn_skel__parse(conflict_data, conflict_len, scratch_pool);
7271 const void *conflict_data; local
7273 conflict_data = svn_sqlite__column_blob(stmt, 5, &conflict_len,
7275 if (conflict_data)
7277 svn_skel_t *conflicts = svn_skel__parse(conflict_data,
8993 !svn_sqlite__column_is_null(stmt_act, 2); /* conflict_data */
9048 if (svn_sqlite__column_is_null(stmt_act, 2)) /* conflict_data */
[all...]

Completed in 384 milliseconds