Searched defs:conflict_p (Results 1 - 4 of 4) sorted by relevance
| /freebsd-10.0-release/contrib/subversion/subversion/libsvn_repos/ |
| H A D | fs-wrap.c | 46 svn_repos_fs_commit_txn(const char **conflict_p, svn_repos_t *repos, svn_revnum_t *new_rev, svn_fs_txn_t *txn, apr_pool_t *pool) argument
|
| /freebsd-10.0-release/contrib/subversion/subversion/libsvn_fs/ |
| H A D | fs-loader.c | 767 svn_fs_commit_txn(const char **conflict_p, svn_revnum_t *new_rev, svn_fs_txn_t *txn, apr_pool_t *pool) argument
1127 svn_fs_merge(const char **conflict_p, svn_fs_root_t *source_root, const char *source_path, svn_fs_root_t *target_root, const char *target_path, svn_fs_root_t *ancestor_root, const char *ancestor_path, apr_pool_t *pool) argument
|
| /freebsd-10.0-release/contrib/subversion/subversion/libsvn_fs_base/ |
| H A D | tree.c | 2024 merge(svn_stringbuf_t *conflict_p, const char *target_path, dag_node_t *target, dag_node_t *source, dag_node_t *ancestor, const char *txn_id, apr_int64_t *mergeinfo_increment_out, trail_t *trail, apr_pool_t *pool) argument
2629 svn_fs_base__commit_txn(const char **conflict_p, svn_revnum_t *new_rev, svn_fs_txn_t *txn, apr_pool_t *pool) argument
2777 base_merge(const char **conflict_p, svn_fs_root_t *source_root, const char *source_path, svn_fs_root_t *target_root, const char *target_path, svn_fs_root_t *ancestor_root, const char *ancestor_path, apr_pool_t *pool) argument
[all...] |
| /freebsd-10.0-release/contrib/subversion/subversion/libsvn_fs_fs/ |
| H A D | tree.c | 1573 merge(svn_stringbuf_t *conflict_p, const char *target_path, dag_node_t *target, dag_node_t *source, dag_node_t *ancestor, const char *txn_id, apr_int64_t *mergeinfo_increment_out, apr_pool_t *pool) argument
1969 svn_fs_fs__commit_txn(const char **conflict_p, svn_revnum_t *new_rev, svn_fs_txn_t *txn, apr_pool_t *pool) argument
2111 fs_merge(const char **conflict_p, svn_fs_root_t *source_root, const char *source_path, svn_fs_root_t *target_root, const char *target_path, svn_fs_root_t *ancestor_root, const char *ancestor_path, apr_pool_t *pool) argument
[all...] |
Completed in 202 milliseconds