You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2009/08/23 17:04:49 UTC
Re: svn commit: r38885 - trunk/subversion/libsvn_wc
I think the general answer is "do not put blank lines into variable
declaration blocks, as they tend to confuse readers into thinking the
end of the declarations have been reached".
On Thu, Aug 20, 2009 at 12:56, Hyrum K. Wright<hy...@hyrumwright.org> wrote:
> Author: hwright
> Date: Thu Aug 20 09:56:16 2009
> New Revision: 38885
>
> Log:
> * subversion/libsvn_wc/copy.c
> (copy_file_administratively): Fix windows build by declaring all variables
> at the start of the block.
>
> Modified:
> trunk/subversion/libsvn_wc/copy.c
>
> Modified: trunk/subversion/libsvn_wc/copy.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/copy.c?pathrev=38885&r1=38884&r2=38885
> ==============================================================================
> --- trunk/subversion/libsvn_wc/copy.c Thu Aug 20 09:11:23 2009 (r38884)
> +++ trunk/subversion/libsvn_wc/copy.c Thu Aug 20 09:56:16 2009 (r38885)
> @@ -459,12 +459,12 @@ copy_file_administratively(const char *s
> svn_wc__db_t *db = svn_wc__adm_get_db(src_access);
> const char *src_abspath;
>
> - SVN_ERR(svn_dirent_get_absolute(&src_abspath, src_path, pool));
> -
> /* The 'dst_path' is simply dst_parent/dst_basename */
> const char *dst_path
> = svn_dirent_join(svn_wc_adm_access_path(dst_parent), dst_basename, pool);
>
> + SVN_ERR(svn_dirent_get_absolute(&src_abspath, src_path, pool));
> +
> /* Sanity check: if dst file exists already, don't allow overwrite. */
> SVN_ERR(svn_io_check_path(dst_path, &dst_kind, pool));
> if (dst_kind != svn_node_none)
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2385698
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2386536
Re: svn commit: r38885 - trunk/subversion/libsvn_wc
Posted by "Hyrum K. Wright" <hy...@hyrumwright.org>.
I completely agree, but didn't modify it here, attempting to follow
the principle of least churn.
On Aug 23, 2009, at 7:04 PM, Greg Stein wrote:
> I think the general answer is "do not put blank lines into variable
> declaration blocks, as they tend to confuse readers into thinking the
> end of the declarations have been reached".
>
> On Thu, Aug 20, 2009 at 12:56, Hyrum K.
> Wright<hy...@hyrumwright.org> wrote:
>> Author: hwright
>> Date: Thu Aug 20 09:56:16 2009
>> New Revision: 38885
>>
>> Log:
>> * subversion/libsvn_wc/copy.c
>> (copy_file_administratively): Fix windows build by declaring all
>> variables
>> at the start of the block.
>>
>> Modified:
>> trunk/subversion/libsvn_wc/copy.c
>>
>> Modified: trunk/subversion/libsvn_wc/copy.c
>> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/copy.c?pathrev=38885&r1=38884&r2=38885
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- trunk/subversion/libsvn_wc/copy.c Thu Aug 20 09:11:23
>> 2009 (r38884)
>> +++ trunk/subversion/libsvn_wc/copy.c Thu Aug 20 09:56:16
>> 2009 (r38885)
>> @@ -459,12 +459,12 @@ copy_file_administratively(const char *s
>> svn_wc__db_t *db = svn_wc__adm_get_db(src_access);
>> const char *src_abspath;
>>
>> - SVN_ERR(svn_dirent_get_absolute(&src_abspath, src_path, pool));
>> -
>> /* The 'dst_path' is simply dst_parent/dst_basename */
>> const char *dst_path
>> = svn_dirent_join(svn_wc_adm_access_path(dst_parent),
>> dst_basename, pool);
>>
>> + SVN_ERR(svn_dirent_get_absolute(&src_abspath, src_path, pool));
>> +
>> /* Sanity check: if dst file exists already, don't allow
>> overwrite. */
>> SVN_ERR(svn_io_check_path(dst_path, &dst_kind, pool));
>> if (dst_kind != svn_node_none)
>>
>> ------------------------------------------------------
>> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2385698
>>
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2386536
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2386801