Home
last modified time | relevance | path

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

/NextBSD/contrib/subversion/subversion/libsvn_wc/
HDupgrade.c676 const char *conflict_data, in read_tree_conflicts() argument
685 if (conflict_data == NULL) in read_tree_conflicts()
688 skel = svn_skel__parse(conflict_data, strlen(conflict_data), pool); in read_tree_conflicts()
733 const char *conflict_data; in migrate_single_tree_conflict_data() local
746 conflict_data = svn_skel__unparse(skel, iterpool)->data; in migrate_single_tree_conflict_data()
768 conflict_data)); in migrate_single_tree_conflict_data()
1563 svn_skel_t *conflict_data = NULL; in svn_wc__upgrade_conflict_skel_from_raw() local
1575 conflict_data = svn_wc__conflict_skel_create(result_pool); in svn_wc__upgrade_conflict_skel_from_raw()
1589 SVN_ERR(svn_wc__conflict_skel_add_text_conflict(conflict_data, in svn_wc__upgrade_conflict_skel_from_raw()
1602 if (!conflict_data) in svn_wc__upgrade_conflict_skel_from_raw()
[all …]
HDwc-queries.sql121 SELECT changelist, properties, conflict_data
162 SELECT local_relpath, changelist, properties, conflict_data
559 INSERT INTO actual_node (wc_id, local_relpath, conflict_data, parent_relpath)
563 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)
[all …]
HDwc-metadata.sql166 conflict_data BLOB, field
705 UPDATE actual_node SET tree_conflict_data = conflict_data;
706 UPDATE actual_node SET conflict_data = NULL;
863 UPDATE actual_node SET conflict_data = ?3, conflict_old = NULL,
HDentries.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()
HDwc-checks.sql118 OR (a.conflict_data IS NULL AND a.properties IS NULL AND a.changelist IS NULL)
HDwc_db.c6667 const void *conflict_data; in svn_wc__db_op_mark_resolved_internal() local
6699 conflict_data = svn_sqlite__column_blob(stmt, 2, &conflict_len, in svn_wc__db_op_mark_resolved_internal()
6701 conflicts = svn_skel__parse(conflict_data, conflict_len, scratch_pool); in svn_wc__db_op_mark_resolved_internal()
7270 const void *conflict_data; in revert_list_read() local
7272 conflict_data = svn_sqlite__column_blob(stmt, 5, &conflict_len, in revert_list_read()
7274 if (conflict_data) in revert_list_read()
7276 svn_skel_t *conflicts = svn_skel__parse(conflict_data, in revert_list_read()