Searched refs:conflict_new (Results 1 - 9 of 9) sorted by relevance
/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/ |
H A D | entries.c | 90 const char *conflict_new; member in struct:db_actual_node_t 972 entry->conflict_new = svn_dirent_basename(their_abspath, 1643 actual_node->conflict_new, 1973 if (parent_relpath && entry->conflict_new) 1974 actual_node->conflict_new = svn_relpath_join(parent_relpath, 1975 entry->conflict_new, 1978 actual_node->conflict_new = entry->conflict_new; 2600 if (entry->conflict_new) 2601 dupentry->conflict_new [all...] |
H A D | wc.h | 614 const char *conflict_new,
|
H A D | wc-metadata.sql | 147 conflict_new TEXT, 647 conflict_old, conflict_working, conflict_new, prop_reject, tree_conflict_data 651 OR conflict_new IS NOT NULL 658 conflict_working = NULL, conflict_new = NULL, prop_reject = NULL, 729 conflict_new TEXT, 738 conflict_new, conflict_working, prop_reject, changelist, text_mod 749 conflict_new TEXT, 763 conflict_new, conflict_working, prop_reject, changelist, text_mod
|
H A D | upgrade.c | 1156 const char *conflict_new, 1169 if (conflict_old || conflict_new || conflict_wrk) 1181 if (conflict_new) 1182 new_abspath = svn_dirent_join(wcroot_abspath, conflict_new, 1296 const char *conflict_new = svn_sqlite__column_text(stmt, 4, NULL); local 1307 conflict_new, 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 | 593 SVN_ERR(read_path(&entry->conflict_new, buf, end, pool)); 885 entry->conflict_new = extract_string_normalize(atts,
|
H A D | deprecated.c | 4457 if ((! *text_conflicted_p) && (entry->conflict_new)) 4459 path = svn_dirent_join(dir_path, entry->conflict_new, pool);
|
/freebsd-11-stable/contrib/subversion/subversion/libsvn_client/ |
H A D | deprecated.c | 2762 if (info->conflict_new) 2763 dupinfo->conflict_new = apr_pstrdup(pool, info->conflict_new); 2861 info->conflict_new = conflict->my_abspath;
|
/freebsd-11-stable/contrib/subversion/subversion/include/ |
H A D | svn_client.h | 7247 const char *conflict_new; 7242 const char *conflict_new; member in struct:svn_info_t
|
H A D | svn_wc.h | 2975 const char *conflict_new; 2968 const char *conflict_new; member in struct:svn_wc_entry_t
|
Completed in 235 milliseconds