Searched defs:conflict_new (Results 1 - 5 of 5) sorted by relevance
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/ |
| H A D | wc-metadata.sql | |
| H A D | upgrade.c | 1296 const char *conflict_new = svn_sqlite__column_text(stmt, 4, NULL); local
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 | entries.c | 90 const char *conflict_new; member in struct:db_actual_node_t
[all...] |
| /freebsd-11-stable/contrib/subversion/subversion/include/ |
| H A D | svn_client.h | 7242 const char *conflict_new; member in struct:svn_info_t
|
| H A D | svn_wc.h | 2968 const char *conflict_new; member in struct:svn_wc_entry_t
|
Completed in 193 milliseconds