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 2011/10/24 14:08:59 UTC
svn commit: r1188104 - in /subversion/trunk/subversion/libsvn_client: copy.c
mergeinfo.c mergeinfo.h
Author: julianfoad
Date: Mon Oct 24 12:08:59 2011
New Revision: 1188104
URL: http://svn.apache.org/viewvc?rev=1188104&view=rev
Log:
In a private API, put the main output parameter first for consistency with
similar APIs.
* subversion/libsvn_client/mergeinfo.h,
subversion/libsvn_client/mergeinfo.c
(svn_client__get_repos_mergeinfo): Swap parameters 1 and 2.
* subversion/libsvn_client/copy.c
(calculate_target_mergeinfo): Update the (only) call.
Modified:
subversion/trunk/subversion/libsvn_client/copy.c
subversion/trunk/subversion/libsvn_client/mergeinfo.c
subversion/trunk/subversion/libsvn_client/mergeinfo.h
Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1188104&r1=1188103&r2=1188104&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Mon Oct 24 12:08:59 2011
@@ -121,7 +121,7 @@ calculate_target_mergeinfo(svn_ra_sessio
const char *old_session_url = NULL;
SVN_ERR(svn_client__ensure_ra_session_url(&old_session_url,
ra_session, src_url, pool));
- SVN_ERR(svn_client__get_repos_mergeinfo(ra_session, &src_mergeinfo,
+ SVN_ERR(svn_client__get_repos_mergeinfo(&src_mergeinfo, ra_session,
"", src_revnum,
svn_mergeinfo_inherited,
TRUE, pool));
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1188104&r1=1188103&r2=1188104&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Mon Oct 24 12:08:59 2011
@@ -432,8 +432,8 @@ svn_client__get_wc_mergeinfo_catalog(svn
}
svn_error_t *
-svn_client__get_repos_mergeinfo(svn_ra_session_t *ra_session,
- svn_mergeinfo_t *target_mergeinfo,
+svn_client__get_repos_mergeinfo(svn_mergeinfo_t *target_mergeinfo,
+ svn_ra_session_t *ra_session,
const char *rel_path,
svn_revnum_t rev,
svn_mergeinfo_inheritance_t inherit,
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.h?rev=1188104&r1=1188103&r2=1188104&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.h (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.h Mon Oct 24 12:08:59 2011
@@ -168,8 +168,8 @@ svn_client__get_wc_mergeinfo_catalog(svn
doesn't support a mergeinfo capability and SQUELCH_INCAPABLE is
TRUE, set *TARGET_MERGEINFO to NULL. */
svn_error_t *
-svn_client__get_repos_mergeinfo(svn_ra_session_t *ra_session,
- svn_mergeinfo_t *target_mergeinfo,
+svn_client__get_repos_mergeinfo(svn_mergeinfo_t *target_mergeinfo,
+ svn_ra_session_t *ra_session,
const char *rel_path,
svn_revnum_t rev,
svn_mergeinfo_inheritance_t inherit,