Searched defs:conflict_old (Results 1 - 5 of 5) sorted by relevance

/freebsd-10-stable/contrib/subversion/subversion/libsvn_wc/
H A Dwc-metadata.sql
H A Dupgrade.c1694 const char *conflict_old = svn_sqlite__column_text(stmt, 2, NULL); local
1550 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.c89 const char *conflict_old; member in struct:db_actual_node_t
[all...]
/freebsd-10-stable/contrib/subversion/subversion/include/
H A Dsvn_client.h6179 const char *conflict_old; member in struct:svn_info_t
H A Dsvn_wc.h2930 const char *conflict_old; member in struct:svn_wc_entry_t

Completed in 256 milliseconds