diff options
Diffstat (limited to 'subversion/libsvn_wc/wc_db.h')
| -rw-r--r-- | subversion/libsvn_wc/wc_db.h | 54 |
1 files changed, 51 insertions, 3 deletions
diff --git a/subversion/libsvn_wc/wc_db.h b/subversion/libsvn_wc/wc_db.h index a947be04ee763..0bf6432100fbb 100644 --- a/subversion/libsvn_wc/wc_db.h +++ b/subversion/libsvn_wc/wc_db.h @@ -1644,7 +1644,12 @@ svn_wc__db_op_mark_conflict(svn_wc__db_t *db, apr_pool_t *scratch_pool); -/* ### caller maintains ACTUAL, and how the resolution occurred. we're just +/* Clear all or some of the conflicts stored on LOCAL_ABSPATH, if any. + + Any work items that are necessary as part of resolving this node + can be passed in WORK_ITEMS. + +### caller maintains ACTUAL, and how the resolution occurred. we're just ### recording state. ### ### I'm not sure that these three values are the best way to do this, @@ -3043,7 +3048,7 @@ svn_wc__db_wclock_obtain(svn_wc__db_t *db, svn_boolean_t steal_lock, apr_pool_t *scratch_pool); -/* Set LOCK_ABSPATH to the path of the the directory that owns the +/* Set LOCK_ABSPATH to the path of the directory that owns the lock on LOCAL_ABSPATH, or NULL, if LOCAL_ABSPATH is not locked. */ svn_error_t* svn_wc__db_wclock_find_root(const char **lock_abspath, @@ -3399,6 +3404,33 @@ svn_wc__db_update_moved_away_conflict_victim(svn_wc__db_t *db, void *notify_baton, apr_pool_t *scratch_pool); +/* Merge local changes from tree conflict victim at LOCAL_ABSPATH into the + directory at DEST_ABSPATH. This function requires that LOCAL_ABSPATH is + a directory and a tree-conflict victim. DST_ABSPATH must be a directory. */ +svn_error_t * +svn_wc__db_update_incoming_move(svn_wc__db_t *db, + const char *local_abspath, + const char *dest_abspath, + svn_wc_operation_t operation, + svn_wc_conflict_action_t action, + svn_wc_conflict_reason_t reason, + svn_cancel_func_t cancel_func, + void *cancel_baton, + svn_wc_notify_func2_t notify_func, + void *notify_baton, + apr_pool_t *scratch_pool); + +/* Merge locally added dir tree conflict victim at LOCAL_ABSPATH with the + * directory since added to the BASE layer by an update operation. */ +svn_error_t * +svn_wc__db_update_local_add(svn_wc__db_t *db, + const char *local_abspath, + svn_cancel_func_t cancel_func, + void *cancel_baton, + svn_wc_notify_func2_t notify_func, + void *notify_baton, + apr_pool_t *scratch_pool); + /* LOCAL_ABSPATH is moved to MOVE_DST_ABSPATH. MOVE_SRC_ROOT_ABSPATH * is the root of the move to MOVE_DST_OP_ROOT_ABSPATH. * DELETE_ABSPATH is the op-root of the move; it's the same @@ -3433,7 +3465,7 @@ svn_wc__db_op_raise_moved_away(svn_wc__db_t *db, apr_pool_t *scratch_pool); /* Breaks all moves of nodes that exist at or below LOCAL_ABSPATH as - shadowed (read: deleted) by the opration rooted at + shadowed (read: deleted) by the operation rooted at delete_op_root_abspath. */ svn_error_t * @@ -3454,6 +3486,22 @@ svn_wc__required_lock_for_resolve(const char **required_abspath, const char *local_abspath, apr_pool_t *result_pool, apr_pool_t *scratch_pool); + +/* Return an array of const char * elements, which represent local absolute + * paths for nodes, within the working copy indicated by WRI_ABSPATH, which + * correspond to REPOS_RELPATH. If no such nodes exist, return an empty array. + * + * Note that this function returns each and every such node that is known + * in the WC, including, for example, nodes that were children of a directory + * which has been replaced. + */ +svn_error_t * +svn_wc__find_repos_node_in_wc(apr_array_header_t **local_abspath_list, + svn_wc__db_t *db, + const char *wri_abspath, + const char *repos_relpath, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); /* @} */ typedef svn_error_t * (*svn_wc__db_verify_cb_t)(void *baton, |