Home
last modified time | relevance | path

Searched refs:conflict_p (Results 1 – 12 of 12) sorted by relevance

/NextBSD/contrib/subversion/subversion/libsvn_fs_x/
HDtree.c1774 merge(svn_stringbuf_t *conflict_p, in merge() argument
1817 svn_stringbuf_setempty(conflict_p); in merge()
1895 return conflict_err(conflict_p, target_path); in merge()
1931 return conflict_err(conflict_p, target_path); in merge()
1946 return conflict_err(conflict_p, target_path); in merge()
2024 return conflict_err(conflict_p, in merge()
2033 return conflict_err(conflict_p, in merge()
2053 return conflict_err(conflict_p, in merge()
2062 SVN_ERR(merge(conflict_p, new_tpath, in merge()
2090 return conflict_err(conflict_p, in merge()
[all …]
HDtree.h57 svn_fs_x__commit_txn(const char **conflict_p,
/NextBSD/contrib/subversion/subversion/libsvn_fs_fs/
HDtree.c1747 merge(svn_stringbuf_t *conflict_p, in merge() argument
1791 svn_stringbuf_setempty(conflict_p); in merge()
1869 return conflict_err(conflict_p, target_path); in merge()
1905 return conflict_err(conflict_p, target_path); in merge()
1920 return conflict_err(conflict_p, target_path); in merge()
2004 return conflict_err(conflict_p, in merge()
2013 return conflict_err(conflict_p, in merge()
2028 return conflict_err(conflict_p, in merge()
2043 SVN_ERR(merge(conflict_p, new_tpath, in merge()
2071 return conflict_err(conflict_p, in merge()
[all …]
HDtree.h52 svn_error_t *svn_fs_fs__commit_txn(const char **conflict_p,
/NextBSD/contrib/subversion/subversion/libsvn_fs_base/
HDtree.h43 svn_error_t *svn_fs_base__commit_txn(const char **conflict_p,
HDtree.c2101 merge(svn_stringbuf_t *conflict_p, in merge() argument
2147 svn_stringbuf_setempty(conflict_p); in merge()
2225 return conflict_err(conflict_p, target_path); in merge()
2257 return conflict_err(conflict_p, target_path); in merge()
2259 return conflict_err(conflict_p, target_path); in merge()
2349 return conflict_err(conflict_p, in merge()
2364 return conflict_err(conflict_p, in merge()
2381 return conflict_err(conflict_p, in merge()
2390 SVN_ERR(merge(conflict_p, new_tpath, in merge()
2424 return conflict_err(conflict_p, in merge()
[all …]
/NextBSD/contrib/subversion/subversion/libsvn_fs/
HDfs-loader.c852 svn_fs_commit_txn(const char **conflict_p, svn_revnum_t *new_rev, in svn_fs_commit_txn() argument
858 if (conflict_p) in svn_fs_commit_txn()
859 *conflict_p = NULL; in svn_fs_commit_txn()
861 err = txn->vtable->commit(conflict_p, new_rev, txn, pool); in svn_fs_commit_txn()
865 if (conflict_p) in svn_fs_commit_txn()
867 SVN_ERR_ASSERT_E(! (SVN_IS_VALID_REVNUM(*new_rev) && *conflict_p != NULL), in svn_fs_commit_txn()
869 SVN_ERR_ASSERT_E((*conflict_p != NULL) in svn_fs_commit_txn()
1310 svn_fs_merge(const char **conflict_p, svn_fs_root_t *source_root, in svn_fs_merge() argument
1315 return svn_error_trace(target_root->vtable->merge(conflict_p, in svn_fs_merge()
HDfs-loader.h274 svn_error_t *(*commit)(const char **conflict_p, svn_revnum_t *new_rev,
409 svn_error_t *(*merge)(const char **conflict_p,
/NextBSD/contrib/subversion/subversion/include/
HDsvn_fs.h1210 svn_fs_commit_txn(const char **conflict_p,
2067 svn_fs_merge(const char **conflict_p,
HDsvn_repos.h2180 svn_repos_fs_commit_txn(const char **conflict_p,
/NextBSD/contrib/subversion/subversion/libsvn_wc/
HDwc_db_update_move.c334 create_tree_conflict(svn_skel_t **conflict_p, in create_tree_conflict() argument
434 *conflict_p = conflict; in create_tree_conflict()
475 *conflict_p = conflict; in create_tree_conflict()
480 create_node_tree_conflict(svn_skel_t **conflict_p, in create_node_tree_conflict() argument
506 create_tree_conflict(conflict_p, umb->wcroot, dst_local_relpath, in create_node_tree_conflict()
/NextBSD/contrib/subversion/subversion/libsvn_repos/
HDfs-wrap.c47 svn_repos_fs_commit_txn(const char **conflict_p, in svn_repos_fs_commit_txn() argument
90 err = svn_fs_commit_txn(conflict_p, new_rev, txn, pool); in svn_repos_fs_commit_txn()