commit 6c1ce3d5a0721152c763213133db0de79f4695b6
author Kamesh J <kameshj@apache.org> Tue Oct 21 11:30:17 2008 +0000
committer Kamesh J <kameshj@apache.org> Tue Oct 21 11:30:17 2008 +0000
tree b22f5f583a07aebd870021c0a3e0a4978fbdd85a
parent f16fb22464e69455a5a6c90037c1096c99476a52

Merge r33641,r33644 from trunk.

Resolved white space conflict.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-r33641@873883 13f79535-47bb-0310-9956-ffa450edef68

subversion/libsvn_client/merge.c

diff --git a/subversion/libsvn_client/merge.c b/subversion/libsvn_client/merge.c
index 0db93b7..5d0a397 100644
--- a/subversion/libsvn_client/merge.c
+++ b/subversion/libsvn_client/merge.c
@@ -542,7 +542,8 @@
                   apr_hash_this(hi, &key, NULL, &value);
                   source_path = key;
                   rangelist = value;
-                  merge_source_url = svn_path_join(merge_source_root_url,
+                  merge_source_url =
+                        svn_path_url_add_component(merge_source_root_url,
                                                    source_path + 1, pool);
                   
                   for (j = 0; j < rangelist->nelts; j++)
@@ -2558,8 +2559,8 @@
       else
         child_repos_path = child->path +
           (merge_target_len ? merge_target_len + 1 : 0);
-      child_url1 = svn_path_join(url1, child_repos_path, iterpool);
-      child_url2 = svn_path_join(url2, child_repos_path, iterpool);
+      child_url1 = svn_path_url_add_component(url1, child_repos_path, iterpool);
+      child_url2 = svn_path_url_add_component(url2, child_repos_path, iterpool);
 
       SVN_ERR(svn_wc__entry_versioned(&child_entry, child->path, adm_access,
                                       FALSE, iterpool));
@@ -4359,12 +4360,12 @@
 
       /* Build our merge source structure. */
       merge_source = apr_pcalloc(pool, sizeof(*merge_source));
-      merge_source->url1 = svn_path_join(source_root_url, 
-                                         svn_path_uri_encode(path1, 
-                                                             pool), pool);
-      merge_source->url2 = svn_path_join(source_root_url, 
-                                         svn_path_uri_encode(segment->path, 
-                                                             pool), pool);
+      merge_source->url1 = svn_path_url_add_component(source_root_url,
+                                                      path1,
+                                                      pool);
+      merge_source->url2 = svn_path_url_add_component(source_root_url,
+                                                      segment->path,
+                                                      pool);
       merge_source->rev1 = rev1;
       merge_source->rev2 = MIN(segment->range_end, maxrev);
 
@@ -6211,8 +6212,7 @@
       related = TRUE;
       
       /* Make YC_PATH into a full URL. */
-      yc_path = svn_path_join(source_repos_root, 
-                              svn_path_uri_encode(yc_path, pool), pool);
+      yc_path = svn_path_url_add_component(source_repos_root, yc_path, pool);
 
       /* If the common ancestor matches the right side of our merge,
          then we only need to reverse-merge the left side. */
@@ -6641,8 +6641,8 @@
                 = APR_ARRAY_IDX(rangelist, rangelist->nelts - 1,
                                 svn_merge_range_t *);
               *rev_left = last_range->end;
-              *url_left = svn_path_join(source_repos_root, segment->path,
-                                        pool);
+              *url_left = svn_path_url_add_component(source_repos_root,
+                                                     segment->path, pool);
               *source_mergeinfo_p = svn_mergeinfo_dup(source_mergeinfo, pool);
               svn_pool_destroy(iterpool);
               svn_pool_destroy(subpool);