Index: subversion/include/svn_client.h =================================================================== --- subversion/include/svn_client.h (revision 29949) +++ subversion/include/svn_client.h (working copy) @@ -4303,16 +4303,6 @@ /** @} */ -/** Return TRUE iff revision kind is dependent on the working copy. - * Otherwise, return FALSE. - * - * @since New in 1.6. - */ -#define SVN_CLIENT_IS_WC_DEPENDENT_REVKIND(kind) \ - ((kind == svn_opt_revision_base || kind == svn_opt_revision_previous || \ - kind == svn_opt_revision_working || kind == svn_opt_revision_committed) \ - ? TRUE : FALSE) - #ifdef __cplusplus } #endif /* __cplusplus */ Index: subversion/libsvn_client/client.h =================================================================== --- subversion/libsvn_client/client.h (revision 29949) +++ subversion/libsvn_client/client.h (working copy) @@ -1059,6 +1059,19 @@ svn_client_ctx_t *ctx, apr_pool_t *pool); + +/** Return TRUE iff revision kind is dependent on the working copy. + * Otherwise, return FALSE. + * + * @since New in 1.6. + */ +#define SVN_CLIENT__REVKIND_NEEDS_WC(kind) \ + (((kind) == svn_opt_revision_base || \ + (kind) == svn_opt_revision_previous || \ + (kind) == svn_opt_revision_working || \ + (kind) == svn_opt_revision_committed) \ + ? TRUE : FALSE) + #ifdef __cplusplus } Index: subversion/libsvn_client/copy.c =================================================================== --- subversion/libsvn_client/copy.c (revision 29949) +++ subversion/libsvn_client/copy.c (working copy) @@ -1711,9 +1711,7 @@ ((svn_client_copy_source_t **) (sources->elts))[i]; if (svn_path_is_url(source->path) - && (source->peg_revision->kind == svn_opt_revision_base - || source->peg_revision->kind == svn_opt_revision_committed - || source->peg_revision->kind == svn_opt_revision_previous)) + && (SVN_CLIENT__REVKIND_NEEDS_WC(source->peg_revision->kind))) return svn_error_create (SVN_ERR_CLIENT_BAD_REVISION, NULL, _("Revision type requires a working copy path, not a URL")); Index: subversion/libsvn_client/log.c =================================================================== --- subversion/libsvn_client/log.c (revision 29949) +++ subversion/libsvn_client/log.c (working copy) @@ -326,9 +326,9 @@ /* Use the passed URL, if there is one. */ if (svn_path_is_url(url_or_path)) { - if (SVN_CLIENT_IS_WC_DEPENDENT_REVKIND(peg_revision->kind) || - SVN_CLIENT_IS_WC_DEPENDENT_REVKIND(start->kind) || - SVN_CLIENT_IS_WC_DEPENDENT_REVKIND(end->kind)) + if (SVN_CLIENT__REVKIND_NEEDS_WC(peg_revision->kind) || + SVN_CLIENT__REVKIND_NEEDS_WC(start->kind) || + SVN_CLIENT__REVKIND_NEEDS_WC(end->kind)) return svn_error_create (SVN_ERR_CLIENT_BAD_REVISION, NULL, @@ -433,7 +433,7 @@ /* If this is a revision type that requires access to the working copy, * we use our initial target path to figure out where to root the RA * session, otherwise we use our URL. */ - if (SVN_CLIENT_IS_WC_DEPENDENT_REVKIND(peg_revision->kind)) + if (SVN_CLIENT__REVKIND_NEEDS_WC(peg_revision->kind)) SVN_ERR(svn_path_condense_targets(&ra_target, NULL, targets, TRUE, pool)); else ra_target = url_or_path;