Re: svn commit: r1124382 - in /subversion/trunk/subversion: include/svn_error_codes.h libsvn_client/merge.c libsvn_ra_neon/commit.c

[Daniel Shahaf]

stevek...@apache.org wrote on Wed, May 18, 2011 at 18:58:50 -0000:
> @@ -9015,7 +9015,7 @@ ensure_wc_is_suitable_merge_target(const
>          }
>  
>        if (min_rev != max_rev)
> -        return svn_error_createf(SVN_ERR_CLIENT_NOT_READY_TO_MERGE, NULL,
> +        return svn_error_createf(SVN_ERR_CLIENT_MERGE_UPDATEREQUIRED, NULL,
>                                   _("Cannot merge into mixed-revision working 
> "
>                                     "copy [%lu:%lu]; try updating first"),
>                                     min_rev, max_rev);

-1 unless you update svn_client_merge4()'s docstring accordingly, since
it promises a specific error code here.