Hi,
Basically all the callers of svn_fs_get_merge_info() need to use the
new ordering of parameters as given by r20712. Pl. find patch attached.
[[[
Follow-up to r20712. Reorder parameters wherever svn_fs_get_merge_info()
is being called.
(In branches/merge-tracking)
* subversion/libsvn_repos/fs-wrap.c
(svn_repos_fs_get_merge_info): Reorder parameters to
svn_fs_get_merge_info()
* subversion/tests/libsvn_fs/fs-test.c
(get_merge_info): Reorder parameters to svn_fs_get_merge_info()
]]]
Regards,
Madan.
Follow-up to r20712. Reorder parameters wherever svn_fs_get_merge_info() is
being called.
(In branches/merge-tracking)
* subversion/libsvn_repos/fs-wrap.c
(svn_repos_fs_get_merge_info): Reorder parameters to
svn_fs_get_merge_info()
* subversion/tests/libsvn_fs/fs-test.c
(get_merge_info): Reorder parameters to svn_fs_get_merge_info()
Index: subversion/tests/libsvn_fs/fs-test.c
===================================================================
--- subversion/tests/libsvn_fs/fs-test.c (revision 20716)
+++ subversion/tests/libsvn_fs/fs-test.c (working copy)
@@ -4476,10 +4476,10 @@
paths = apr_array_make(pool, 1, sizeof (const char *));
APR_ARRAY_PUSH(paths, const char *) = "/A/E";
- SVN_ERR(svn_fs_get_merge_info(revision_root, paths, &result, TRUE, pool));
+ SVN_ERR(svn_fs_get_merge_info(&result, revision_root, paths, TRUE, pool));
paths = apr_array_make(pool, 1, sizeof (const char *));
APR_ARRAY_PUSH(paths, const char *) = "/A/B/E";
- SVN_ERR(svn_fs_get_merge_info(revision_root, paths, &result, TRUE, pool));
+ SVN_ERR(svn_fs_get_merge_info(&result, revision_root, paths, TRUE, pool));
return SVN_NO_ERROR;
}
Index: subversion/libsvn_repos/fs-wrap.c
===================================================================
--- subversion/libsvn_repos/fs-wrap.c (revision 20716)
+++ subversion/libsvn_repos/fs-wrap.c (working copy)
@@ -625,7 +625,7 @@
us to protect the name of where a change was merged from, but not
the change itself. */
if (readable_paths->nelts > 0)
- SVN_ERR(svn_fs_get_merge_info(root, readable_paths, mergeinfo,
+ SVN_ERR(svn_fs_get_merge_info(mergeinfo, root, readable_paths,
include_parents, pool));
else
*mergeinfo = NULL;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jul 18 17:53:13 2006