Home
last modified time | relevance | path

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

/freebsd-12.1/contrib/subversion/subversion/libsvn_wc/
H A Dupgrade.c1163 svn_skel_t *conflict_data = NULL; in svn_wc__upgrade_conflict_skel_from_raw() local
1175 conflict_data = svn_wc__conflict_skel_create(result_pool); in svn_wc__upgrade_conflict_skel_from_raw()
1202 if (!conflict_data) in svn_wc__upgrade_conflict_skel_from_raw()
1203 conflict_data = svn_wc__conflict_skel_create(result_pool); in svn_wc__upgrade_conflict_skel_from_raw()
1222 if (!conflict_data) in svn_wc__upgrade_conflict_skel_from_raw()
1270 else if (conflict_data) in svn_wc__upgrade_conflict_skel_from_raw()
1277 *conflicts = conflict_data; in svn_wc__upgrade_conflict_skel_from_raw()
1291 svn_skel_t *conflict_data; in bump_30_upgrade_one_conflict() local
1302 SVN_ERR(svn_wc__upgrade_conflict_skel_from_raw(&conflict_data, in bump_30_upgrade_one_conflict()
1313 SVN_ERR_ASSERT(conflict_data != NULL); in bump_30_upgrade_one_conflict()
[all …]
H A Dwc-queries.sql563 UPDATE actual_node SET conflict_data = ?3
736 AND conflict_data IS NULL
748 AND conflict_data IS NULL
818 conflict_data = NULL,
840 conflict_data = NULL,
930 SELECT local_relpath, conflict_data
933 NOT (conflict_data IS NULL)
963 AND conflict_data IS NOT NULL
1394 conflict_data BLOB, field
1424 WHERE OLD.conflict_data IS NOT NULL
[all …]
H A Dwc-metadata.sql166 conflict_data BLOB, field
657 UPDATE actual_node SET conflict_data = ?3, conflict_old = NULL,
H A Dentries.c352 write_tree_conflicts(const char **conflict_data, in write_tree_conflicts() argument
368 *conflict_data = svn_skel__unparse(skel, pool)->data; in write_tree_conflicts()
1621 svn_skel_t *conflict_data = NULL; in insert_actual_node() local
1637 &conflict_data, in insert_actual_node()
1650 if (conflict_data) in insert_actual_node()
1652 svn_stringbuf_t *data = svn_skel__unparse(conflict_data, scratch_pool); in insert_actual_node()
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; in svn_wc__db_op_mark_resolved_internal() local
6696 conflict_data = svn_sqlite__column_blob(stmt, 2, &conflict_len, in svn_wc__db_op_mark_resolved_internal()
6701 if (!conflict_data) in svn_wc__db_op_mark_resolved_internal()
6704 conflicts = svn_skel__parse(conflict_data, conflict_len, scratch_pool); in svn_wc__db_op_mark_resolved_internal()
7271 const void *conflict_data; in revert_list_read() local
7273 conflict_data = svn_sqlite__column_blob(stmt, 5, &conflict_len, in revert_list_read()
7275 if (conflict_data) in revert_list_read()
7277 svn_skel_t *conflicts = svn_skel__parse(conflict_data, in revert_list_read()