summaryrefslogtreecommitdiff
path: root/subversion/libsvn_wc/workqueue.h
diff options
context:
space:
mode:
Diffstat (limited to 'subversion/libsvn_wc/workqueue.h')
-rw-r--r--subversion/libsvn_wc/workqueue.h22
1 files changed, 8 insertions, 14 deletions
diff --git a/subversion/libsvn_wc/workqueue.h b/subversion/libsvn_wc/workqueue.h
index 0617a60..630de07 100644
--- a/subversion/libsvn_wc/workqueue.h
+++ b/subversion/libsvn_wc/workqueue.h
@@ -73,7 +73,11 @@ extern "C" {
These will be combined as appropriate, and returned in one of the
above three styles.
- The resulting list will be ordered: WORK_ITEM1 first, then WORK_ITEM2 */
+ The resulting list will be ordered: WORK_ITEM1 first, then WORK_ITEM2.
+
+ The result contains a shallow copy of the inputs. Allocate any
+ additional storage needed in RESULT_POOL.
+ */
svn_skel_t *
svn_wc__wq_merge(svn_skel_t *work_item1,
svn_skel_t *work_item2,
@@ -177,22 +181,12 @@ svn_wc__wq_build_sync_file_flags(svn_skel_t **work_item,
/* Set *WORK_ITEM to a new work item that will install a property reject
- file for LOCAL_ABSPATH into the working copy. The property conflicts will
- be taken from CONFLICT_SKEL.
-
- ### Caution: Links CONFLICT_SKEL into the *WORK_ITEM, which involves
- modifying *CONFLICT_SKEL.
-
- ### TODO: Make CONFLICT_SKEL 'const' and dup it into RESULT_POOL.
-
- ### TODO: If CONFLICT_SKEL is NULL, take property conflicts from wc_db
- for the given DB/LOCAL_ABSPATH.
+ file for LOCAL_ABSPATH into the working copy.
*/
svn_error_t *
svn_wc__wq_build_prej_install(svn_skel_t **work_item,
svn_wc__db_t *db,
const char *local_abspath,
- svn_skel_t *conflict_skel,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
@@ -221,8 +215,8 @@ svn_error_t *
svn_wc__wq_build_dir_install(svn_skel_t **work_item,
svn_wc__db_t *db,
const char *local_abspath,
- apr_pool_t *scratch_pool,
- apr_pool_t *result_pool);
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
svn_error_t *
svn_wc__wq_build_postupgrade(svn_skel_t **work_item,