You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/03/24 13:18:50 UTC
svn commit: r927028 - in /subversion/trunk/subversion: include/svn_client.h
libsvn_client/deprecated.c libsvn_client/mergeinfo.c svn/mergeinfo-cmd.c
Author: julianfoad
Date: Wed Mar 24 12:18:50 2010
New Revision: 927028
URL: http://svn.apache.org/viewvc?rev=927028&view=rev
Log:
Swap the order of params in svn_client_mergeinfo_log() to keep related
params together.
* subversion/include/svn_client.h,
subversion/libsvn_client/mergeinfo.c
(svn_client_mergeinfo_get_merged): Keep 'path_or_url' and 'peg_revision'
together.
* subversion/libsvn_client/deprecated.c
(svn_client_mergeinfo_log_merged, svn_client_mergeinfo_log_eligible):
Adjust calls accordingly.
* subversion/svn/mergeinfo-cmd.c
(svn_cl__mergeinfo): Adjust calls accordingly.
Modified:
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/libsvn_client/deprecated.c
subversion/trunk/subversion/libsvn_client/mergeinfo.c
subversion/trunk/subversion/svn/mergeinfo-cmd.c
Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=927028&r1=927027&r2=927028&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Wed Mar 24 12:18:50 2010
@@ -3018,7 +3018,7 @@ svn_client_mergeinfo_get_merged(apr_hash
* requested then return a #SVN_ERR_UNSUPPORTED_FEATURE error.
*
* @a discover_changed_paths and @a revprops are the same as for
- * svn_client_log4(). Use @a scratch_pool for all temporary allocations.
+ * svn_client_log5(). Use @a scratch_pool for all temporary allocations.
*
* @a ctx is a context used for authentication.
*
@@ -3028,8 +3028,8 @@ svn_client_mergeinfo_get_merged(apr_hash
* @since New in 1.7.
*/
svn_error_t *
-svn_client_mergeinfo_log(const char *path_or_url,
- svn_boolean_t finding_merged,
+svn_client_mergeinfo_log(svn_boolean_t finding_merged,
+ const char *path_or_url,
const svn_opt_revision_t *peg_revision,
const char *merge_source_path_or_url,
const svn_opt_revision_t *src_peg_revision,
Modified: subversion/trunk/subversion/libsvn_client/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/deprecated.c?rev=927028&r1=927027&r2=927028&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_client/deprecated.c Wed Mar 24 12:18:50 2010
@@ -1823,7 +1823,7 @@ svn_client_mergeinfo_log_merged(const ch
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
- return svn_client_mergeinfo_log(path_or_url, TRUE, peg_revision,
+ return svn_client_mergeinfo_log(TRUE, path_or_url, peg_revision,
merge_source_path_or_url,
src_peg_revision,
log_receiver, log_receiver_baton,
@@ -1844,7 +1844,7 @@ svn_client_mergeinfo_log_eligible(const
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
- return svn_client_mergeinfo_log(path_or_url, FALSE, peg_revision,
+ return svn_client_mergeinfo_log(FALSE, path_or_url, peg_revision,
merge_source_path_or_url,
src_peg_revision,
log_receiver, log_receiver_baton,
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=927028&r1=927027&r2=927028&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Wed Mar 24 12:18:50 2010
@@ -1659,8 +1659,8 @@ svn_client_mergeinfo_get_merged(apr_hash
svn_error_t *
-svn_client_mergeinfo_log(const char *path_or_url,
- svn_boolean_t finding_merged,
+svn_client_mergeinfo_log(svn_boolean_t finding_merged,
+ const char *path_or_url,
const svn_opt_revision_t *peg_revision,
const char *merge_source_path_or_url,
const svn_opt_revision_t *src_peg_revision,
Modified: subversion/trunk/subversion/svn/mergeinfo-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/mergeinfo-cmd.c?rev=927028&r1=927027&r2=927028&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/mergeinfo-cmd.c (original)
+++ subversion/trunk/subversion/svn/mergeinfo-cmd.c Wed Mar 24 12:18:50 2010
@@ -117,7 +117,7 @@ svn_cl__mergeinfo(apr_getopt_t *os,
/* Do the real work, depending on the requested data flavor. */
if (opt_state->show_revs == svn_cl__show_revs_merged)
{
- SVN_ERR(svn_client_mergeinfo_log(target, TRUE, &tgt_peg_revision,
+ SVN_ERR(svn_client_mergeinfo_log(TRUE, target, &tgt_peg_revision,
source, &src_peg_revision,
print_log_rev, NULL,
TRUE, depth, NULL, ctx,
@@ -125,7 +125,7 @@ svn_cl__mergeinfo(apr_getopt_t *os,
}
else if (opt_state->show_revs == svn_cl__show_revs_eligible)
{
- SVN_ERR(svn_client_mergeinfo_log(target, FALSE, &tgt_peg_revision,
+ SVN_ERR(svn_client_mergeinfo_log(FALSE, target, &tgt_peg_revision,
source, &src_peg_revision,
print_log_rev, NULL,
TRUE, depth, NULL, ctx,