Home
last modified time | relevance | path

Searched refs:conflict_working (Results 1 – 3 of 3) sorted by relevance

/NextBSD/contrib/subversion/subversion/libsvn_wc/
HDwc-metadata.sql148 conflict_working TEXT, field
775 AND (conflict_new IS NULL) AND (conflict_working IS NULL)
853 conflict_old, conflict_working, conflict_new, prop_reject, tree_conflict_data
856 OR conflict_working IS NOT NULL
864 conflict_working = NULL, conflict_new = NULL, prop_reject = NULL,
953 conflict_working TEXT, field
961 conflict_new, conflict_working, prop_reject, changelist, text_mod
973 conflict_working TEXT, field
986 conflict_new, conflict_working, prop_reject, changelist, text_mod
HDcopy.c257 const char *conflict_working; in copy_versioned_file() local
265 err = svn_wc__conflict_read_text_conflict(&conflict_working, NULL, NULL, in copy_versioned_file()
274 conflict_working = NULL; in copy_versioned_file()
279 if (conflict_working) in copy_versioned_file()
284 SVN_ERR(svn_io_check_path(conflict_working, &working_kind, in copy_versioned_file()
291 my_src_abspath = conflict_working; in copy_versioned_file()
HDentries.c91 const char *conflict_working; member
1641 actual_node->conflict_working, in insert_actual_node()
1979 actual_node->conflict_working = svn_relpath_join(parent_relpath, in write_entry()
1983 actual_node->conflict_working = entry->conflict_wrk; in write_entry()