Searched refs:conflict_wrk (Results 1 - 9 of 9) sorted by relevance

/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
H A Dmerge.c1006 const char *conflict_wrk;
1044 &conflict_wrk,
1053 conflict_wrk,
1058 conflict_wrk = NULL;
1068 conflict_wrk,
1005 const char *conflict_wrk; local
H A Dwc.h613 const char *conflict_wrk,
H A Dupgrade.c1155 const char *conflict_wrk,
1169 if (conflict_old || conflict_new || conflict_wrk)
1185 if (conflict_wrk)
1186 wrk_abspath = svn_dirent_join(wcroot_abspath, conflict_wrk,
1295 const char *conflict_wrk = svn_sqlite__column_text(stmt, 3, NULL); local
1306 conflict_wrk,
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 Dentries.c965 entry->conflict_wrk = svn_dirent_basename(my_abspath, result_pool);
1979 if (parent_relpath && entry->conflict_wrk)
1981 entry->conflict_wrk,
1984 actual_node->conflict_working = entry->conflict_wrk;
2602 if (entry->conflict_wrk)
2603 dupentry->conflict_wrk = apr_pstrdup(pool, entry->conflict_wrk);
H A Dold-and-busted.c595 SVN_ERR(read_path(&entry->conflict_wrk, buf, end, pool));
888 entry->conflict_wrk = extract_string_normalize(atts,
H A Ddeprecated.c4464 if ((! *text_conflicted_p) && (entry->conflict_wrk))
4466 path = svn_dirent_join(dir_path, entry->conflict_wrk, pool);
/freebsd-11-stable/contrib/subversion/subversion/libsvn_client/
H A Ddeprecated.c2764 if (info->conflict_wrk)
2765 dupinfo->conflict_wrk = apr_pstrdup(pool, info->conflict_wrk);
2862 info->conflict_wrk = conflict->their_abspath;
/freebsd-11-stable/contrib/subversion/subversion/include/
H A Dsvn_client.h7248 const char *conflict_wrk;
7243 const char *conflict_wrk; member in struct:svn_info_t
H A Dsvn_wc.h2979 const char *conflict_wrk;
2972 const char *conflict_wrk; member in struct:svn_wc_entry_t

Completed in 313 milliseconds