You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Philip Martin <ph...@wandisco.com> on 2010/12/22 18:39:54 UTC
Re: svn commit: r1051978 - in /subversion/trunk/subversion: include/private/svn_repos_private.h libsvn_repos/commit.c mod_dav_svn/version.c
blair@apache.org writes:
> Author: blair
> Date: Wed Dec 22 16:46:40 2010
> New Revision: 1051978
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/version.c?rev=1051978&r1=1051977&r2=1051978&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/mod_dav_svn/version.c (original)
> +++ subversion/trunk/subversion/mod_dav_svn/version.c Wed Dec 22 16:46:40 2010
> @@ -922,15 +922,15 @@ dav_svn__checkin(dav_resource *resource,
> {
> if (serr)
> {
> + apr_status_t apr_err = serr->apr_err;
../src/subversion/mod_dav_svn/version.c: In function ‘dav_svn__checkin’:
../src/subversion/mod_dav_svn/version.c:925: warning: declaration of ‘apr_err’ shadows a previous local
../src/subversion/mod_dav_svn/version.c:852: warning: shadowed declaration is here
> const char *post_commit_err = svn_repos__post_commit_error_str
> (serr, resource->pool);
> - ap_log_perror(APLOG_MARK, APLOG_ERR, serr->apr_err,
> - resource->pool,
> + serr = SVN_NO_ERROR;
> + ap_log_perror(APLOG_MARK, APLOG_ERR, apr_err, resource->pool,
> "commit of r%ld succeeded, but an error occurred "
> "after the commit: '%s'",
> new_rev,
> post_commit_err);
> - svn_error_clear(serr);
> }
> }
--
Philip
Re: svn commit: r1051978 - in /subversion/trunk/subversion: include/private/svn_repos_private.h
libsvn_repos/commit.c mod_dav_svn/version.c
Posted by Blair Zajac <bl...@orcaware.com>.
On 12/22/10 10:39 AM, Philip Martin wrote:
> blair@apache.org writes:
>
>> Author: blair
>> Date: Wed Dec 22 16:46:40 2010
>> New Revision: 1051978
>
>> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/version.c?rev=1051978&r1=1051977&r2=1051978&view=diff
>> ==============================================================================
>> --- subversion/trunk/subversion/mod_dav_svn/version.c (original)
>> +++ subversion/trunk/subversion/mod_dav_svn/version.c Wed Dec 22 16:46:40 2010
>> @@ -922,15 +922,15 @@ dav_svn__checkin(dav_resource *resource,
>> {
>> if (serr)
>> {
>> + apr_status_t apr_err = serr->apr_err;
>
> ../src/subversion/mod_dav_svn/version.c: In function ‘dav_svn__checkin’:
> ../src/subversion/mod_dav_svn/version.c:925: warning: declaration of ‘apr_err’ shadows a previous local
> ../src/subversion/mod_dav_svn/version.c:852: warning: shadowed declaration is here
Thanks, fixed in r1052041.
I've switched over to using --enable-maintainer-mode.
Blair