You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2011/08/25 11:52:31 UTC
svn commit: r1161474 - /subversion/trunk/subversion/libsvn_wc/merge.c
Author: danielsh
Date: Thu Aug 25 09:52:31 2011
New Revision: 1161474
URL: http://svn.apache.org/viewvc?rev=1161474&view=rev
Log:
No functional change.
* subversion/libsvn_wc/merge.c
(svn_wc__internal_merge): Make a temporary parameter rename permanent.
Modified:
subversion/trunk/subversion/libsvn_wc/merge.c
Modified: subversion/trunk/subversion/libsvn_wc/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/merge.c?rev=1161474&r1=1161473&r2=1161474&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Thu Aug 25 09:52:31 2011
@@ -1320,7 +1320,6 @@ svn_wc__internal_merge(svn_skel_t **work
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- apr_pool_t *pool = scratch_pool; /* ### temporary rename */
const char *detranslated_target_abspath;
svn_boolean_t is_binary = FALSE;
const svn_prop_t *mimeprop;
@@ -1357,13 +1356,15 @@ svn_wc__internal_merge(svn_skel_t **work
SVN_ERR(detranslate_wc_file(&detranslated_target_abspath, &mt,
(! is_binary) && diff3_cmd != NULL,
target_abspath,
- cancel_func, cancel_baton, pool, pool));
+ cancel_func, cancel_baton,
+ scratch_pool, scratch_pool));
/* We cannot depend on the left file to contain the same eols as the
right file. If the merge target has mods, this will mark the entire
file as conflicted, so we need to compensate. */
SVN_ERR(maybe_update_target_eols(&left_abspath, &mt, left_abspath,
- cancel_func, cancel_baton, pool, pool));
+ cancel_func, cancel_baton,
+ scratch_pool, scratch_pool));
if (is_binary)
{