Searched refs:conflict_path (Results 1 - 6 of 6) sorted by relevance
| /freebsd-12-stable/contrib/subversion/subversion/include/private/ |
| H A D | svn_fs_private.h | 140 * If a conflict occurs during the commit, then @a *conflict_path will
143 * message that incorporates @a *conflict_path.
148 * and @a conflict_path (the OUT parameters) have an indeterminate value if
164 * @a result_pool will be used to allocate space for @a conflict_path.
169 * failed commit due to a conflict (reported via @a *conflict_path); and
177 const char **conflict_path,
|
| /freebsd-12-stable/contrib/subversion/subversion/libsvn_fs/ |
| H A D | editor.c | 759 const char **conflict_path,
775 *conflict_path = NULL;
818 *conflict_path = apr_pstrdup(result_pool, inner_conflict_path);
757 svn_fs__editor_commit(svn_revnum_t *revision, svn_error_t **post_commit_err, const char **conflict_path, svn_editor_t *editor, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
|
| /freebsd-12-stable/contrib/subversion/subversion/libsvn_repos/ |
| H A D | commit.c | 1290 const char *conflict_path;
1305 SVN_ERR(svn_fs__editor_commit(&revision, &post_commit_err, &conflict_path,
1309 if (conflict_path != NULL)
1311 _("Conflict at '%s'"), conflict_path);
1286 const char *conflict_path; local
|
| /freebsd-12-stable/contrib/subversion/subversion/libsvn_fs_x/ |
| H A D | tree.c | 640 conflict_err(svn_stringbuf_t *conflict_path,
643 svn_stringbuf_set(conflict_path, path);
633 conflict_err(svn_stringbuf_t *conflict_path, const char *path) argument
|
| /freebsd-12-stable/contrib/subversion/subversion/libsvn_fs_base/ |
| H A D | tree.c | 2080 conflict_err(svn_stringbuf_t *conflict_path,
2083 svn_stringbuf_set(conflict_path, path);
2070 conflict_err(svn_stringbuf_t *conflict_path, const char *path) argument
|
| /freebsd-12-stable/contrib/subversion/subversion/libsvn_fs_fs/ |
| H A D | tree.c | 1751 conflict_err(svn_stringbuf_t *conflict_path,
1754 svn_stringbuf_set(conflict_path, path);
1743 conflict_err(svn_stringbuf_t *conflict_path, const char *path) argument
|
Completed in 193 milliseconds