You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2011/12/20 11:27:09 UTC
svn commit: r1221186 - /subversion/trunk/subversion/libsvn_client/merge.c
Author: julianfoad
Date: Tue Dec 20 10:27:08 2011
New Revision: 1221186
URL: http://svn.apache.org/viewvc?rev=1221186&view=rev
Log:
* subversion/libsvn_client/merge.c
(get_target_and_lock_abspath): Fix pool name: s/scratch_pool/result_pool/.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1221186&r1=1221185&r2=1221186&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Dec 20 10:27:08 2011
@@ -9523,17 +9523,17 @@ get_target_and_lock_abspath(const char *
const char **lock_abspath,
const char *target_wcpath,
svn_client_ctx_t *ctx,
- apr_pool_t *scratch_pool)
+ apr_pool_t *result_pool)
{
svn_node_kind_t kind;
SVN_ERR(svn_dirent_get_absolute(target_abspath, target_wcpath,
- scratch_pool));
+ result_pool));
SVN_ERR(svn_wc_read_kind(&kind, ctx->wc_ctx, *target_abspath, FALSE,
- scratch_pool));
+ result_pool));
if (kind == svn_node_dir)
*lock_abspath = *target_abspath;
else
- *lock_abspath = svn_dirent_dirname(*target_abspath, scratch_pool);
+ *lock_abspath = svn_dirent_dirname(*target_abspath, result_pool);
return SVN_NO_ERROR;
}