Searched refs:conflict_old (Results 1 - 9 of 9) sorted by relevance
/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/ |
H A D | entries.c | 89 const char *conflict_old; member in struct:db_actual_node_t 968 entry->conflict_old = svn_dirent_basename(their_old_abspath, 1641 actual_node->conflict_old, 1964 if (entry->conflict_old) 1967 if (parent_relpath && entry->conflict_old) 1968 actual_node->conflict_old = svn_relpath_join(parent_relpath, 1969 entry->conflict_old, 1972 actual_node->conflict_old = entry->conflict_old; 2598 if (entry->conflict_old) [all...] |
H A D | wc.h | 612 const char *conflict_old,
|
H A D | wc-metadata.sql | 146 conflict_old TEXT, 647 conflict_old, conflict_working, conflict_new, prop_reject, tree_conflict_data 649 WHERE conflict_old IS NOT NULL 657 UPDATE actual_node SET conflict_data = ?3, conflict_old = NULL, 728 conflict_old TEXT, 737 wc_id, local_relpath, parent_relpath, properties, conflict_old, 748 conflict_old TEXT, 762 wc_id, local_relpath, parent_relpath, properties, conflict_old,
|
H A D | upgrade.c | 1154 const char *conflict_old, 1169 if (conflict_old || conflict_new || conflict_wrk) 1177 if (conflict_old) 1178 old_abspath = svn_dirent_join(wcroot_abspath, conflict_old, 1294 const char *conflict_old = svn_sqlite__column_text(stmt, 2, NULL); local 1305 conflict_old, 1150 svn_wc__upgrade_conflict_skel_from_raw(svn_skel_t **conflicts, svn_wc__db_t *db, const char *wri_abspath, const char *local_relpath, const char *conflict_old, const char *conflict_wrk, const char *conflict_new, const char *prej_file, const char *tree_conflict_data, apr_size_t tree_conflict_len, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
|
H A D | old-and-busted.c | 591 SVN_ERR(read_path(&entry->conflict_old, buf, end, pool)); 882 entry->conflict_old = extract_string_normalize(atts,
|
H A D | deprecated.c | 4450 if (entry->conflict_old) 4452 path = svn_dirent_join(dir_path, entry->conflict_old, pool);
|
/freebsd-11-stable/contrib/subversion/subversion/libsvn_client/ |
H A D | deprecated.c | 2760 if (info->conflict_old) 2761 dupinfo->conflict_old = apr_pstrdup(pool, info->conflict_old); 2860 info->conflict_old = conflict->base_abspath;
|
/freebsd-11-stable/contrib/subversion/subversion/include/ |
H A D | svn_client.h | 7246 const char *conflict_old; 7241 const char *conflict_old; member in struct:svn_info_t
|
H A D | svn_wc.h | 2971 const char *conflict_old; 2964 const char *conflict_old; member in struct:svn_wc_entry_t
|
Completed in 318 milliseconds