[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r38687 - in trunk/subversion: include libsvn_ra_svn

From: Greg Stein <gstein_at_gmail.com>
Date: Tue, 11 Aug 2009 23:31:15 +0200

Why did you remove the error code form 1.7? Remember: this is *trunk*
... if you want to do something on the 1.6.x or 1.5.x branch, then
fine. But adding error codes (and keeping them!) is just fine on
trunk.

On Tue, Aug 11, 2009 at 22:56, Ben Collins-Sussman<sussman_at_red-bean.com> wrote:
> Author: sussman
> Date: Tue Aug 11 13:56:56 2009
> New Revision: 38687
>
> Log:
> Make r38686 api-promise compatible with 1.6.5 and and 1.5.x backport.
>
> * subversion/include/svn_error_codes.h:
>  (SVN_ERR_RA_SVN_EDIT_ABORTED):  remove the new error code.
>
> * subversion/libsvn_ra_svn/client.c
>  (ra_svn_replay_range):  use SVN_ERR_RA_SVN_IO_ERROR.
>
> Modified:
>   trunk/subversion/include/svn_error_codes.h
>   trunk/subversion/libsvn_ra_svn/client.c
>
> Modified: trunk/subversion/include/svn_error_codes.h
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/include/svn_error_codes.h?pathrev=38687&r1=38686&r2=38687
> ==============================================================================
> --- trunk/subversion/include/svn_error_codes.h  Tue Aug 11 13:36:50 2009        (r38686)
> +++ trunk/subversion/include/svn_error_codes.h  Tue Aug 11 13:56:56 2009        (r38687)
> @@ -929,17 +929,11 @@ SVN_ERROR_START
>              SVN_ERR_RA_SVN_CATEGORY_START + 6,
>              "Client/server version mismatch")
>
> -    /** @since New in 1.5. */
> +  /** @since New in 1.5. */
>   SVN_ERRDEF(SVN_ERR_RA_SVN_NO_MECHANISMS,
>              SVN_ERR_RA_SVN_CATEGORY_START + 7,
>              "Cannot negotiate authentication mechanism")
>
> -   /** @since New in 1.6.5 / 1.7  */
> -  SVN_ERRDEF(SVN_ERR_RA_SVN_EDIT_ABORTED,
> -             SVN_ERR_RA_SVN_CATEGORY_START + 8,
> -             "Editor drive was aborted")
> -
> -
>   /* libsvn_ra_serf errors */
>   /** @since New in 1.5. */
>   SVN_ERRDEF(SVN_ERR_RA_SERF_SSPI_INITIALISATION_FAILED,
>
> Modified: trunk/subversion/libsvn_ra_svn/client.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_ra_svn/client.c?pathrev=38687&r1=38686&r2=38687
> ==============================================================================
> --- trunk/subversion/libsvn_ra_svn/client.c     Tue Aug 11 13:36:50 2009        (r38686)
> +++ trunk/subversion/libsvn_ra_svn/client.c     Tue Aug 11 13:56:56 2009        (r38687)
> @@ -2294,8 +2294,8 @@ ra_svn_replay_range(svn_ra_session_t *se
>          revfinish_func and commit the transaction! */
>       if (drive_aborted) {
>         svn_pool_destroy(iterpool);
> -        return svn_error_create(SVN_ERR_RA_SVN_EDIT_ABORTED, NULL,
> -                                _("Commit error during replay_range()"));
> +        return svn_error_create(SVN_ERR_RA_SVN_IO_ERROR, NULL,
> +                                _("Error while replaying commit"));
>       }
>       SVN_ERR(revfinish_func(rev, replay_baton,
>                              editor, edit_baton,
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2382671
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2382688
Received on 2009-08-11 23:31:31 CEST

This is an archived mail posted to the Subversion Dev mailing list.