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 2012/11/07 20:56:07 UTC
svn commit: r1406776 - /subversion/trunk/subversion/svn/mergeinfo-cmd.c
Author: julianfoad
Date: Wed Nov 7 19:56:07 2012
New Revision: 1406776
URL: http://svn.apache.org/viewvc?rev=1406776&view=rev
Log:
Un-break the build: a follow-up to r1406766.
* subversion/svn/mergeinfo-cmd.c
(mergeinfo_summary): Put the parameters in the right order.
Modified:
subversion/trunk/subversion/svn/mergeinfo-cmd.c
Modified: subversion/trunk/subversion/svn/mergeinfo-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/mergeinfo-cmd.c?rev=1406776&r1=1406775&r2=1406776&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/mergeinfo-cmd.c (original)
+++ subversion/trunk/subversion/svn/mergeinfo-cmd.c Wed Nov 7 19:56:07 2012
@@ -233,8 +233,10 @@ mergeinfo_summary(
ctx, pool, pool));
SVN_ERR(svn_client_automatic_merge_get_locations(
- &yca_url, &base_url, &right_url, &target_url,
- &yca_rev, &base_rev, &right_rev, &target_rev,
+ &yca_url, &yca_rev,
+ &base_url, &base_rev,
+ &right_url, &right_rev,
+ &target_url, &target_rev,
&repos_root_url,
the_merge, pool));
reintegrate_like = svn_client_automatic_merge_is_reintegrate_like(the_merge);