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/11/23 14:14:11 UTC
svn commit: r1038097 - /subversion/trunk/subversion/libsvn_client/merge.c
Author: julianfoad
Date: Tue Nov 23 13:14:10 2010
New Revision: 1038097
URL: http://svn.apache.org/viewvc?rev=1038097&view=rev
Log:
Fix some wrong uses of svn_uri_* APIs.
* subversion/libsvn_client/merge.c
(log_find_operative_revs): s/uri_skip_ancestor/relpath_*/ because
'subtree_missing_this_rev' is a relpath.
(find_unmerged_mergeinfo): s/uri_join/relpath_join/ because '*_rel_path'
parameters are relpaths - duh!
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1038097&r1=1038096&r2=1038097&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Nov 23 13:14:10 2010
@@ -9612,8 +9612,8 @@ log_find_operative_revs(void *baton,
&& strcmp(subtree_missing_this_rev, source_rel_path))
{
const char *suffix =
- svn_uri_skip_ancestor(subtree_missing_this_rev,
- source_rel_path);
+ svn_relpath_skip_ancestor(subtree_missing_this_rev,
+ source_rel_path);
missing_path = apr_pstrmemdup(pool, path,
strlen(path) - strlen(suffix) - 1);
}
@@ -9844,10 +9844,10 @@ find_unmerged_mergeinfo(svn_mergeinfo_ca
svn_pool_clear(iterpool);
source_path = path + strlen(target_repos_rel_path);
- if (source_path[0] == '/') /* Remove leading '/' for svn_uri_join. */
+ if (source_path[0] == '/') /* Remove leading '/'. */
source_path++;
- source_path = svn_uri_join(source_repos_rel_path, source_path,
- iterpool);
+ source_path = svn_relpath_join(source_repos_rel_path, source_path,
+ iterpool);
source_path_rel_to_session =
svn_relpath_skip_ancestor(source_repos_rel_path, source_path);
@@ -9998,7 +9998,7 @@ find_unmerged_mergeinfo(svn_mergeinfo_ca
svn_pool_clear(iterpool);
target_path = source_path + strlen(source_repos_rel_path);
- if (target_path[0] == '/') /* Remove leading '/' for svn_uri_join. */
+ if (target_path[0] == '/') /* Remove leading '/'. */
target_path++;
err = svn_client__repos_location_segments(&segments,
target_ra_session,