You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/07/09 15:13:25 UTC
svn commit: r1501252 - in /subversion/trunk/subversion:
include/private/svn_wc_private.h libsvn_client/checkout.c
libsvn_wc/adm_files.c
Author: stsp
Date: Tue Jul 9 13:13:24 2013
New Revision: 1501252
URL: http://svn.apache.org/r1501252
Log:
Revert r1501163. I will commit an alternative fix later.
Modified:
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/libsvn_client/checkout.c
subversion/trunk/subversion/libsvn_wc/adm_files.c
Modified: subversion/trunk/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_wc_private.h?rev=1501252&r1=1501251&r2=1501252&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Tue Jul 9 13:13:24 2013
@@ -1863,36 +1863,6 @@ svn_wc__acquire_write_lock_for_resolve(c
const char *local_abspath,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-
-
-/** Create a new administrative area for @a local_abspath, so
- * that @a local_abspath is a working copy subdir based on @a url at @a
- * revision, with depth @a depth, and with repository UUID @a repos_uuid
- * and repository root URL @a repos_root_url.
- *
- * @a depth must be a definite depth, it cannot be #svn_depth_unknown.
- * @a repos_uuid and @a repos_root_url MUST NOT be @c NULL, and
- * @a repos_root_url must be a prefix of @a url.
- *
- * If the administrative area already exists, raise an error.
- *
- * Do not ensure existence of @a local_abspath itself; if @a local_abspath
- * does not exist, return error.
- *
- * Use @a scratch_pool for temporary allocations.
- *
- * @since New in 1.9.
- */
-svn_error_t *
-svn_wc__init_adm(svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- const char *url,
- const char *repos_root_url,
- const char *repos_uuid,
- svn_revnum_t revision,
- svn_depth_t depth,
- apr_pool_t *scratch_pool);
-
#ifdef __cplusplus
}
#endif /* __cplusplus */
Modified: subversion/trunk/subversion/libsvn_client/checkout.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/checkout.c?rev=1501252&r1=1501251&r2=1501252&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/checkout.c (original)
+++ subversion/trunk/subversion/libsvn_client/checkout.c Tue Jul 9 13:13:24 2013
@@ -58,9 +58,9 @@ initialize_area(const char *local_abspat
depth = svn_depth_infinity;
/* Make the unversioned directory into a versioned one. */
- SVN_ERR(svn_wc__init_adm(ctx->wc_ctx, local_abspath, pathrev->url,
- pathrev->repos_root_url, pathrev->repos_uuid,
- pathrev->rev, depth, pool));
+ SVN_ERR(svn_wc_ensure_adm4(ctx->wc_ctx, local_abspath, pathrev->url,
+ pathrev->repos_root_url, pathrev->repos_uuid,
+ pathrev->rev, depth, pool));
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_wc/adm_files.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.c?rev=1501252&r1=1501251&r2=1501252&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.c Tue Jul 9 13:13:24 2013
@@ -517,32 +517,6 @@ svn_wc_ensure_adm4(svn_wc_context_t *wc_
}
svn_error_t *
-svn_wc__init_adm(svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- const char *url,
- const char *repos_root_url,
- const char *repos_uuid,
- svn_revnum_t revision,
- svn_depth_t depth,
- apr_pool_t *scratch_pool)
-
-{
- const char *repos_relpath = svn_uri_skip_ancestor(repos_root_url, url,
- scratch_pool);
-
- SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
- SVN_ERR_ASSERT(url != NULL);
- SVN_ERR_ASSERT(repos_root_url != NULL);
- SVN_ERR_ASSERT(repos_uuid != NULL);
- SVN_ERR_ASSERT(repos_relpath != NULL);
- SVN_ERR_ASSERT(depth != svn_depth_unknown);
-
- return svn_error_trace(init_adm(wc_ctx->db, local_abspath,
- repos_relpath, repos_root_url, repos_uuid,
- revision, depth, scratch_pool));
-}
-
-svn_error_t *
svn_wc__adm_destroy(svn_wc__db_t *db,
const char *dir_abspath,
svn_cancel_func_t cancel_func,