Yeah. conflict2() is actually fixin' to get a rename to internal_..._conflict shortly. conflict2() isn't a replacement for a deprecated function, but rather a separate function with different arguments.
-Hyrum
> -------Original Message-------
> From: Greg Stein <gstein_at_gmail.com>
> Subject: Re: svn commit: r38426 - in trunk/subversion: include/private libsvn_client libsvn_wc
> Sent: 15 Jul '09 13:35
>
> Oop. Nevermind. I remember the conflict2 function now. The result of
> some pretty ugly ass semantics and whatnot for the original. Ugh.
>
> On Wed, Jul 15, 2009 at 22:33, Greg Stein<gstein_at_gmail.com> wrote:
> > Private APIs don't need versioning. Just change all callers.
> >
> > On Wed, Jul 15, 2009 at 22:16, Hyrum K. Wright<hyrum_at_hyrumwright.org> wrote:
> >> Author: hwright
> >> Date: Wed Jul 15 13:16:30 2009
> >> New Revision: 38426
> >>
> >> Log:
> >> Rev a private API to use a working copy context.
> >>
> >> * subversion/include/private/svn_wc_private.h
> >> (svn_wc__get_tree_conflict): Use a wc context and abspath pair.
> >>
> >> * subversion/libsvn_wc/adm_ops.c
> >> (revert_internal, resolve_found_entry_callback),
> >> * subversion/libsvn_wc/status.c
> >> (assemble_status, get_dir_status),
> >> * subversion/libsvn_wc/questions.c
> >> (svn_wc_conflicted_p2),
> >> * subversion/libsvn_wc/entries.c
> >> (visit_tc_too_error_handler, svn_wc__walk_entries_and_tc),
> >> * subversion/libsvn_wc/update_editor.c
> >> (already_in_a_tree_conflict):
> >> Update callers to use svn_wc__get_tree_conflict2() with an absolute path.
> >>
> >> * subversion/libsvn_wc/tree_conflicts.c
> >> (svn_wc__add_tree_conflict): Update to use svn_wc__get_tree_conflict2() with
> >> an absolute path.
> >> (svn_wc__get_tree_conflict): Update parameters, add an assertion, and update
> >> wrapping call to svn_wc__get_tree_conflict2().
> >> (svn_wc__get_tree_conflict2): Take an absolute path, and assert that what we
> >> got.
> >>
> >> * subversion/libsvn_client/info.c
> >> (found_entry_baton): Add a wc context.
> >> (info_found_entry_callback, info_error_handler): Update callers to
> >> svn_wc__get_tree_conflict().
> >> (crawl_entries): Initialize the working copy context.
> >>
> >> * subversion/libsvn_client/merge.c
> >> (tree_conflict, tree_conflict_on_add): Update callers to
> >> svn_wc__get_tree_conflict().
> >>
> >> * subversion/libsvn_client/commit_util.c
> >> (svn_client__harvest_committables): Same.
> >>
> >> Modified:
> >> trunk/subversion/include/private/svn_wc_private.h
> >> trunk/subversion/libsvn_client/commit_util.c
> >> trunk/subversion/libsvn_client/info.c
> >> trunk/subversion/libsvn_client/merge.c
> >> trunk/subversion/libsvn_wc/adm_ops.c
> >> trunk/subversion/libsvn_wc/entries.c
> >> trunk/subversion/libsvn_wc/questions.c
> >> trunk/subversion/libsvn_wc/status.c
> >> trunk/subversion/libsvn_wc/tree_conflicts.c
> >> trunk/subversion/libsvn_wc/update_editor.c
> >>
> >> Modified: trunk/subversion/include/private/svn_wc_private.h
> >> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/include/private/svn_wc_private.h?pathrev=38426&r1=38425&r2=38426
> >> ==============================================================================
> >> --- trunk/subversion/include/private/svn_wc_private.h Wed Jul 15 03:48:37 2009 (r38425)
> >> +++ trunk/subversion/include/private/svn_wc_private.h Wed Jul 15 13:16:30 2009 (r38426)
> >> @@ -146,17 +146,19 @@ svn_wc__set_file_external_location(svn_w
> >>
> >> /** Set @a *tree_conflict to a newly allocated @c
> >> * svn_wc_conflict_description_t structure describing the tree
> >> - * conflict state of @a victim_path, or to @c NULL if @a victim_path
> >> - * is not in a state of tree conflict. @a adm_access is the admin
> >> - * access baton for @a victim_path. Use @a pool for all allocations.
> >> + * conflict state of @a victim_abspath, or to @c NULL if @a victim_abspath
> >> + * is not in a state of tree conflict. @a wc_ctx is a working copy context
> >> + * used to access @a victim_path. Allocate @a *tree_conflict in @a result_pool,
> >> + * use @a scratch_pool for temporary allocations.
> >> *
> >> - * @since New in 1.6.
> >> + * @since New in 1.7.
> >> */
> >> svn_error_t *
> >> svn_wc__get_tree_conflict(svn_wc_conflict_description_t **tree_conflict,
> >> - const char *victim_path,
> >> - svn_wc_adm_access_t *adm_access,
> >> - apr_pool_t *pool);
> >> + svn_wc_context_t *wc_ctx,
> >> + const char *victim_abspath,
> >> + apr_pool_t *result_pool,
> >> + apr_pool_t *scratch_pool);
> >>
> >> /** Record the tree conflict described by @a conflict in the WC.
> >> * @a adm_access must be a write-access baton for the parent directory of
> >>
> >> Modified: trunk/subversion/libsvn_client/commit_util.c
> >> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/commit_util.c?pathrev=38426&r1=38425&r2=38426
> >> ==============================================================================
> >> --- trunk/subversion/libsvn_client/commit_util.c Wed Jul 15 03:48:37 2009 (r38425)
> >> +++ trunk/subversion/libsvn_client/commit_util.c Wed Jul 15 13:16:30 2009 (r38426)
> >> @@ -943,6 +943,7 @@ svn_client__harvest_committables(apr_has
> >> svn_wc_adm_access_t *adm_access;
> >> const svn_wc_entry_t *entry;
> >> const char *target;
> >> + const char *target_abspath;
> >> svn_error_t *err;
> >>
> >> svn_pool_clear(subpool);
> >> @@ -957,6 +958,8 @@ svn_client__harvest_committables(apr_has
> >> else
> >> target = svn_wc_adm_access_path(parent_adm);
> >>
> >> + SVN_ERR(svn_dirent_get_absolute(&target_abspath, target, subpool));
> >> +
> >> /* No entry? This TARGET isn't even under version control! */
> >> SVN_ERR(svn_wc_adm_probe_retrieve(&adm_access, parent_adm,
> >> target, subpool));
> >> @@ -969,7 +972,8 @@ svn_client__harvest_committables(apr_has
> >> if (err && (err->apr_err == SVN_ERR_ENTRY_NOT_FOUND))
> >> {
> >> svn_wc_conflict_description_t *conflict = NULL;
> >> - svn_wc__get_tree_conflict(&conflict, target, adm_access, pool);
> >> + svn_wc__get_tree_conflict(&conflict, ctx->wc_ctx, target_abspath,
> >> + pool, subpool);
> >> if (conflict != NULL)
> >> {
> >> svn_error_clear(err);
> >>
> >> Modified: trunk/subversion/libsvn_client/info.c
> >> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/info.c?pathrev=38426&r1=38425&r2=38426
> >> ==============================================================================
> >> --- trunk/subversion/libsvn_client/info.c Wed Jul 15 03:48:37 2009 (r38425)
> >> +++ trunk/subversion/libsvn_client/info.c Wed Jul 15 13:16:30 2009 (r38426)
> >> @@ -258,6 +258,7 @@ struct found_entry_baton
> >> apr_hash_t *changelist_hash;
> >> svn_info_receiver_t receiver;
> >> void *receiver_baton;
> >> + svn_wc_context_t *wc_ctx;
> >> svn_wc_adm_access_t *adm_access; /* adm access baton for root of walk */
> >> };
> >>
> >> @@ -269,6 +270,7 @@ info_found_entry_callback(const char *pa
> >> apr_pool_t *pool)
> >> {
> >> struct found_entry_baton *fe_baton = walk_baton;
> >> + const char *local_abspath;
> >>
> >> /* We're going to receive dirents twice; we want to ignore the
> >> first one (where it's a child of a parent dir), and only print
> >> @@ -277,17 +279,14 @@ info_found_entry_callback(const char *pa
> >> && (strcmp(entry->name, SVN_WC_ENTRY_THIS_DIR)))
> >> return SVN_NO_ERROR;
> >>
> >> + SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
> >> if (SVN_WC__CL_MATCH(fe_baton->changelist_hash, entry))
> >> {
> >> svn_info_t *info;
> >> - svn_wc_adm_access_t *adm_access;
> >>
> >> SVN_ERR(build_info_from_entry(&info, entry, path, pool));
> >> - SVN_ERR(svn_wc_adm_probe_try3(&adm_access, fe_baton->adm_access, path,
> >> - FALSE /* read-only */, 0 /* levels */,
> >> - NULL, NULL, pool));
> >> - SVN_ERR(svn_wc__get_tree_conflict(&info->tree_conflict, path, adm_access,
> >> - pool));
> >> + SVN_ERR(svn_wc__get_tree_conflict(&info->tree_conflict, fe_baton->wc_ctx,
> >> + local_abspath, pool, pool));
> >> SVN_ERR(fe_baton->receiver(fe_baton->receiver_baton, path, info, pool));
> >> }
> >> return SVN_NO_ERROR;
> >> @@ -309,14 +308,12 @@ info_error_handler(const char *path,
> >> if (err && (err->apr_err == SVN_ERR_UNVERSIONED_RESOURCE))
> >> {
> >> struct found_entry_baton *fe_baton = walk_baton;
> >> - svn_wc_adm_access_t *adm_access;
> >> svn_wc_conflict_description_t *tree_conflict;
> >> + const char *local_abspath;
> >>
> >> - SVN_ERR(svn_wc_adm_probe_try3(&adm_access, fe_baton->adm_access,
> >> - svn_dirent_dirname(path, pool),
> >> - FALSE, 0, NULL, NULL, pool));
> >> - SVN_ERR(svn_wc__get_tree_conflict(&tree_conflict, path, adm_access,
> >> - pool));
> >> + SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
> >> + SVN_ERR(svn_wc__get_tree_conflict(&tree_conflict, fe_baton->wc_ctx,
> >> + local_abspath, pool, pool));
> >>
> >> if (tree_conflict)
> >> {
> >> @@ -367,6 +364,7 @@ crawl_entries(const char *wcpath,
> >> fe_baton.receiver = receiver;
> >> fe_baton.receiver_baton = receiver_baton;
> >> fe_baton.adm_access = adm_access;
> >> + fe_baton.wc_ctx = ctx->wc_ctx;
> >> return svn_wc_walk_entries3(wcpath, adm_access,
> >> &entry_walk_callbacks, &fe_baton,
> >> depth, FALSE, ctx->cancel_func,
> >>
> >> Modified: trunk/subversion/libsvn_client/merge.c
> >> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/merge.c?pathrev=38426&r1=38425&r2=38426
> >> ==============================================================================
> >> --- trunk/subversion/libsvn_client/merge.c Wed Jul 15 03:48:37 2009 (r38425)
> >> +++ trunk/subversion/libsvn_client/merge.c Wed Jul 15 13:16:30 2009 (r38426)
> >> @@ -526,6 +526,7 @@ tree_conflict(merge_cmd_baton_t *merge_b
> >> {
> >> svn_wc_conflict_description_t *conflict;
> >> svn_wc_conflict_description_t *existing_conflict;
> >> + const char *conflict_abspath;
> >>
> >> if (merge_b->record_only || merge_b->dry_run)
> >> return SVN_NO_ERROR;
> >> @@ -534,8 +535,11 @@ tree_conflict(merge_cmd_baton_t *merge_b
> >> SVN_ERR(make_tree_conflict(&conflict, merge_b, adm_access, victim_path,
> >> node_kind, action, reason));
> >>
> >> - SVN_ERR(svn_wc__get_tree_conflict(&existing_conflict, conflict->path,
> >> - adm_access, merge_b->pool));
> >> + SVN_ERR(svn_dirent_get_absolute(&conflict_abspath, conflict->path,
> >> + merge_b->pool));
> >> + SVN_ERR(svn_wc__get_tree_conflict(&existing_conflict, merge_b->ctx->wc_ctx,
> >> + conflict_abspath, merge_b->pool,
> >> + merge_b->pool));
> >>
> >> if (existing_conflict != NULL)
> >> /* Re-adding an existing tree conflict victim is an error. */
> >> @@ -559,6 +563,7 @@ tree_conflict_on_add(merge_cmd_baton_t *
> >> {
> >> svn_wc_conflict_description_t *existing_conflict;
> >> svn_wc_conflict_description_t *conflict;
> >> + const char *conflict_abspath;
> >>
> >> if (merge_b->record_only || merge_b->dry_run)
> >> return SVN_NO_ERROR;
> >> @@ -568,8 +573,11 @@ tree_conflict_on_add(merge_cmd_baton_t *
> >> SVN_ERR(make_tree_conflict(&conflict, merge_b, adm_access, victim_path,
> >> node_kind, action, reason));
> >>
> >> - SVN_ERR(svn_wc__get_tree_conflict(&existing_conflict, conflict->path,
> >> - adm_access, merge_b->pool));
> >> + SVN_ERR(svn_dirent_get_absolute(&conflict_abspath, conflict->path,
> >> + merge_b->pool));
> >> + SVN_ERR(svn_wc__get_tree_conflict(&existing_conflict, merge_b->ctx->wc_ctx,
> >> + conflict_abspath, merge_b->pool,
> >> + merge_b->pool));
> >>
> >> if (existing_conflict != NULL)
> >> {
> >>
> >> Modified: trunk/subversion/libsvn_wc/adm_ops.c
> >> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/adm_ops.c?pathrev=38426&r1=38425&r2=38426
> >> ==============================================================================
> >> --- trunk/subversion/libsvn_wc/adm_ops.c Wed Jul 15 03:48:37 2009 (r38425)
> >> +++ trunk/subversion/libsvn_wc/adm_ops.c Wed Jul 15 13:16:30 2009 (r38426)
> >> @@ -2219,6 +2219,9 @@ revert_internal(svn_wc__db_t *db,
> >> const svn_wc_entry_t *entry;
> >> svn_wc_adm_access_t *dir_access;
> >> svn_wc_conflict_description_t *tree_conflict;
> >> + const char *local_abspath;
> >> +
> >> + SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
> >>
> >> /* Check cancellation here, so recursive calls get checked early. */
> >> if (cancel_func)
> >> @@ -2230,7 +2233,8 @@ revert_internal(svn_wc__db_t *db,
> >> /* Safeguard 1: the item must be versioned for any reversion to make sense,
> >> except that a tree conflict can exist on an unversioned item. */
> >> SVN_ERR(svn_wc_entry(&entry, path, dir_access, FALSE, pool));
> >> - SVN_ERR(svn_wc__get_tree_conflict2(&tree_conflict, path, db, pool, pool));
> >> + SVN_ERR(svn_wc__get_tree_conflict2(&tree_conflict, local_abspath, db, pool,
> >> + pool));
> >> if (entry == NULL && tree_conflict == NULL)
> >> return svn_error_createf(SVN_ERR_UNVERSIONED_RESOURCE, NULL,
> >> _("Cannot revert unversioned item '%s'"), path);
> >> @@ -2282,7 +2286,8 @@ revert_internal(svn_wc__db_t *db,
> >>
> >> /* Clear any tree conflict on the path, even if it is not a versioned
> >> resource. */
> >> - SVN_ERR(svn_wc__get_tree_conflict2(&conflict, path, db, pool, pool));
> >> + SVN_ERR(svn_wc__get_tree_conflict2(&conflict, local_abspath, db, pool,
> >> + pool));
> >> if (conflict)
> >> {
> >> SVN_ERR(svn_wc__del_tree_conflict(path, parent_access, pool));
> >> @@ -2938,6 +2943,9 @@ resolve_found_entry_callback(const char
> >> struct resolve_callback_baton *baton = walk_baton;
> >> svn_boolean_t resolved = FALSE;
> >> svn_boolean_t wc_root = FALSE;
> >> + const char *local_abspath;
> >> +
> >> + SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
> >>
> >> /* We're going to receive dirents twice; we want to ignore the
> >> first one (where it's a child of a parent dir), and only process
> >> @@ -2988,7 +2996,7 @@ resolve_found_entry_callback(const char
> >> SVN_ERR(svn_wc_adm_probe_retrieve(&parent_adm_access, baton->adm_access,
> >> conflict_dir, pool));
> >>
> >> - SVN_ERR(svn_wc__get_tree_conflict2(&conflict, path, baton->db,
> >> + SVN_ERR(svn_wc__get_tree_conflict2(&conflict, local_abspath, baton->db,
> >> pool, pool));
> >> if (conflict)
> >> {
> >>
> >> Modified: trunk/subversion/libsvn_wc/entries.c
> >> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/entries.c?pathrev=38426&r1=38425&r2=38426
> >> ==============================================================================
> >> --- trunk/subversion/libsvn_wc/entries.c Wed Jul 15 03:48:37 2009 (r38425)
> >> +++ trunk/subversion/libsvn_wc/entries.c Wed Jul 15 13:16:30 2009 (r38426)
> >> @@ -3561,6 +3561,9 @@ visit_tc_too_error_handler(const char *p
> >> apr_pool_t *pool)
> >> {
> >> struct visit_tc_too_baton_t *baton = walk_baton;
> >> + const char *local_abspath;
> >> +
> >> + SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
> >>
> >> /* If this is an unversioned tree conflict victim, call the "found entry"
> >> * callback. This can occur on the root node of the walk; we do not expect
> >> @@ -3570,7 +3573,7 @@ visit_tc_too_error_handler(const char *p
> >> svn_wc_conflict_description_t *conflict;
> >>
> >> /* See if there is any tree conflict on this path. */
> >> - SVN_ERR(svn_wc__get_tree_conflict2(&conflict, path, baton->db,
> >> + SVN_ERR(svn_wc__get_tree_conflict2(&conflict, local_abspath, baton->db,
> >> pool, pool));
> >>
> >> /* If so, don't regard it as an error but call the "found entry"
> >> @@ -3608,10 +3611,13 @@ svn_wc__walk_entries_and_tc(const char *
> >> apr_pool_t *pool)
> >> {
> >> svn_wc__db_t *db = svn_wc__adm_get_db(adm_access);
> >> + const char *local_abspath;
> >> svn_error_t *err;
> >> svn_wc_adm_access_t *path_adm_access;
> >> const svn_wc_entry_t *entry;
> >>
> >> + SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
> >> +
> >> /* Is 'path' versioned? Set path_adm_access accordingly. */
> >> /* First: Get item's adm access (meaning parent's if it's a file). */
> >> err = svn_wc_adm_probe_retrieve(&path_adm_access, adm_access, path, pool);
> >> @@ -3658,7 +3664,8 @@ svn_wc__walk_entries_and_tc(const char *
> >> * call the "found entry" callback with a null "entry" parameter. */
> >> svn_wc_conflict_description_t *conflict;
> >>
> >> - SVN_ERR(svn_wc__get_tree_conflict2(&conflict, path, db, pool, pool));
> >> + SVN_ERR(svn_wc__get_tree_conflict2(&conflict, local_abspath, db, pool,
> >> + pool));
> >> if (conflict)
> >> SVN_ERR(walk_callbacks->found_entry(path, NULL, walk_baton, pool));
> >> }
> >>
> >> Modified: trunk/subversion/libsvn_wc/questions.c
> >> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/questions.c?pathrev=38426&r1=38425&r2=38426
> >> ==============================================================================
> >> --- trunk/subversion/libsvn_wc/questions.c Wed Jul 15 03:48:37 2009 (r38425)
> >> +++ trunk/subversion/libsvn_wc/questions.c Wed Jul 15 13:16:30 2009 (r38426)
> >> @@ -47,6 +47,7 @@
> >> #include "translate.h"
> >> #include "wc_db.h"
> >> #include "lock.h"
> >> +#include "tree_conflicts.h"
> >>
> >> #include "svn_private_config.h"
> >> #include "private/svn_wc_private.h"
> >> @@ -405,7 +406,10 @@ svn_wc_conflicted_p2(svn_boolean_t *text
> >> svn_node_kind_t kind;
> >> const svn_wc_entry_t *entry;
> >> const char* dir_path = svn_dirent_dirname(path, pool);
> >> + svn_wc__db_t *db = svn_wc__adm_get_db(adm_access);
> >> + const char *local_abspath;
> >>
> >> + SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
> >> SVN_ERR(svn_wc_entry(&entry, path, adm_access, TRUE, pool));
> >>
> >> if (text_conflicted_p)
> >> @@ -468,7 +472,8 @@ svn_wc_conflicted_p2(svn_boolean_t *text
> >> svn_wc_conflict_description_t *conflict;
> >>
> >> SVN_ERR_ASSERT(adm_access != NULL);
> >> - SVN_ERR(svn_wc__get_tree_conflict(&conflict, path, adm_access, pool));
> >> + SVN_ERR(svn_wc__get_tree_conflict2(&conflict, local_abspath, db, pool,
> >> + pool));
> >> *tree_conflicted_p = (conflict != NULL);
> >> }
> >>
> >>
> >> Modified: trunk/subversion/libsvn_wc/status.c
> >> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/status.c?pathrev=38426&r1=38425&r2=38426
> >> ==============================================================================
> >> --- trunk/subversion/libsvn_wc/status.c Wed Jul 15 03:48:37 2009 (r38425)
> >> +++ trunk/subversion/libsvn_wc/status.c Wed Jul 15 13:16:30 2009 (r38426)
> >> @@ -314,7 +314,8 @@ assemble_status(svn_wc_status2_t **statu
> >> /* Find out whether the path is a tree conflict victim.
> >> * This function will set tree_conflict to NULL if the path
> >> * is not a victim. */
> >> - SVN_ERR(svn_wc__get_tree_conflict(&tree_conflict, path, adm_access, pool));
> >> + SVN_ERR(svn_wc__get_tree_conflict2(&tree_conflict, local_abspath, db, pool,
> >> + pool));
> >>
> >> if (! entry)
> >> {
> >> @@ -867,6 +868,7 @@ get_dir_status(struct edit_baton *eb,
> >> apr_hash_index_t *hi;
> >> const svn_wc_entry_t *dir_entry;
> >> const char *path = svn_wc_adm_access_path(adm_access);
> >> + svn_wc__db_t *db = svn_wc__adm_get_db(adm_access);
> >> const char *local_abspath;
> >> apr_hash_t *dirents;
> >> apr_array_header_t *patterns = NULL;
> >> @@ -980,9 +982,13 @@ get_dir_status(struct edit_baton *eb,
> >> else
> >> {
> >> svn_wc_conflict_description_t *tree_conflict;
> >> - SVN_ERR(svn_wc__get_tree_conflict(&tree_conflict,
> >> - svn_dirent_join(path, entry, subpool),
> >> - adm_access, subpool));
> >> + const char *abspath;
> >> +
> >> + SVN_ERR(svn_dirent_get_absolute(&abspath,
> >> + svn_dirent_join(path, entry, subpool),
> >> + subpool));
> >> + SVN_ERR(svn_wc__get_tree_conflict2(&tree_conflict, abspath, db,
> >> + subpool, subpool));
> >> if (tree_conflict)
> >> {
> >> /* A tree conflict will block commit, so we'll pass TRUE
> >>
> >> Modified: trunk/subversion/libsvn_wc/tree_conflicts.c
> >> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/tree_conflicts.c?pathrev=38426&r1=38425&r2=38426
> >> ==============================================================================
> >> --- trunk/subversion/libsvn_wc/tree_conflicts.c Wed Jul 15 03:48:37 2009 (r38425)
> >> +++ trunk/subversion/libsvn_wc/tree_conflicts.c Wed Jul 15 13:16:30 2009 (r38426)
> >> @@ -30,6 +30,7 @@
> >> #include "log.h"
> >> #include "entries.h"
> >> #include "lock.h"
> >> +#include "wc.h"
> >>
> >> #include "private/svn_skel.h"
> >> #include "private/svn_wc_private.h"
> >> @@ -520,10 +521,14 @@ svn_wc__add_tree_conflict(const svn_wc_c
> >> {
> >> svn_wc_conflict_description_t *existing_conflict;
> >> svn_stringbuf_t *log_accum = NULL;
> >> + svn_wc__db_t *db = svn_wc__adm_get_db(adm_access);
> >> + const char *conflict_abspath;
> >> +
> >> + SVN_ERR(svn_dirent_get_absolute(&conflict_abspath, conflict->path, pool));
> >>
> >> /* Re-adding an existing tree conflict victim is an error. */
> >> - SVN_ERR(svn_wc__get_tree_conflict(&existing_conflict, conflict->path,
> >> - adm_access, pool));
> >> + SVN_ERR(svn_wc__get_tree_conflict2(&existing_conflict, conflict_abspath, db,
> >> + pool, pool));
> >> if (existing_conflict != NULL)
> >> return svn_error_create(SVN_ERR_WC_CORRUPT, NULL,
> >> _("Attempt to add tree conflict that already exists"));
> >> @@ -620,27 +625,29 @@ svn_wc__loggy_del_tree_conflict(svn_stri
> >>
> >> svn_error_t *
> >> svn_wc__get_tree_conflict(svn_wc_conflict_description_t **tree_conflict,
> >> - const char *victim_path,
> >> - svn_wc_adm_access_t *adm_access,
> >> - apr_pool_t *pool)
> >> + svn_wc_context_t *wc_ctx,
> >> + const char *victim_abspath,
> >> + apr_pool_t *result_pool,
> >> + apr_pool_t *scratch_pool)
> >> {
> >> + SVN_ERR_ASSERT(svn_dirent_is_absolute(victim_abspath));
> >> +
> >> return svn_error_return(svn_wc__get_tree_conflict2(
> >> tree_conflict,
> >> - victim_path,
> >> - svn_wc__adm_get_db(adm_access),
> >> - pool,
> >> - pool));
> >> + victim_abspath,
> >> + wc_ctx->db,
> >> + result_pool,
> >> + scratch_pool));
> >> }
> >>
> >>
> >> svn_error_t *
> >> svn_wc__get_tree_conflict2(svn_wc_conflict_description_t **tree_conflict,
> >> - const char *victim_path,
> >> + const char *victim_abspath,
> >> svn_wc__db_t *db,
> >> apr_pool_t *result_pool,
> >> apr_pool_t *scratch_pool)
> >> {
> >> - const char *victim_abspath;
> >> const char *parent_abspath;
> >> const char *victim_name;
> >> svn_error_t *err;
> >> @@ -648,7 +655,8 @@ svn_wc__get_tree_conflict2(svn_wc_confli
> >> const svn_wc_entry_t *entry;
> >> int i;
> >>
> >> - SVN_ERR(svn_dirent_get_absolute(&victim_abspath, victim_path, scratch_pool));
> >> + SVN_ERR_ASSERT(svn_dirent_is_absolute(victim_abspath));
> >> +
> >> svn_dirent_split(victim_abspath, &parent_abspath, &victim_name,
> >> scratch_pool);
> >> err = svn_wc__get_entry(&entry, db, parent_abspath, FALSE,
> >> @@ -665,7 +673,7 @@ svn_wc__get_tree_conflict2(svn_wc_confli
> >> }
> >>
> >> SVN_ERR(svn_wc__read_tree_conflicts(&conflicts, entry->tree_conflict_data,
> >> - svn_dirent_dirname(victim_path,
> >> + svn_dirent_dirname(victim_abspath,
> >> scratch_pool),
> >> result_pool));
> >>
> >>
> >> Modified: trunk/subversion/libsvn_wc/update_editor.c
> >> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/update_editor.c?pathrev=38426&r1=38425&r2=38426
> >> ==============================================================================
> >> --- trunk/subversion/libsvn_wc/update_editor.c Wed Jul 15 03:48:37 2009 (r38425)
> >> +++ trunk/subversion/libsvn_wc/update_editor.c Wed Jul 15 13:16:30 2009 (r38426)
> >> @@ -1806,7 +1806,8 @@ already_in_a_tree_conflict(const char **
> >> ancestor = APR_ARRAY_IDX(ancestors, i, const char *);
> >>
> >> svn_pool_clear(iterpool);
> >> - SVN_ERR(svn_wc__get_tree_conflict2(&conflict, ancestor, db, pool,
> >> + SVN_ERR(svn_dirent_get_absolute(&ancestor_abspath, ancestor, iterpool));
> >> + SVN_ERR(svn_wc__get_tree_conflict2(&conflict, ancestor_abspath, db, pool,
> >> iterpool));
> >> if (conflict != NULL)
> >> {
> >>
> >> ------------------------------------------------------
> >> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2371578
> >>
> >
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2371583
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2371613
Received on 2009-07-16 00:51:31 CEST