svn commit: r1805763 - /subversion/trunk/subversion/libsvn_client/merge.c

[st...@apache.org]

Author: stsp
Date: Tue Aug 22 13:53:59 2017
New Revision: 1805763

URL: http://svn.apache.org/viewvc?rev=1805763&view=rev
Log:
* subversion/libsvn_client/merge.c
  (merge_file_added): Remove a redundant string splitting operation during
   construction of the copyfrom URL. The local_abspath being split here
   to obtain a 'child' relpath was created by string concatenation in the
   same function, based on the merge target abspath and the added relpath
   which is provided by the caller. We can just use the same added relpath
   parameter directly when constructing the copyfrom URL.

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=1805763&r1=1805762&r2=1805763&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Aug 22 13:53:59 2017
@@ -2240,13 +2240,9 @@ merge_file_added(const char *relpath,
          Otherwise, we'll use a pure add. */
       if (merge_b->same_repos)
         {
-          const char *child =
-            svn_dirent_skip_ancestor(merge_b->target->abspath,
-                                     local_abspath);
-          SVN_ERR_ASSERT(child != NULL);
           copyfrom_url = svn_path_url_add_component2(
                                        merge_b->merge_source.loc2->url,
-                                       child, scratch_pool);
+                                       relpath, scratch_pool);
           copyfrom_rev = right_source->revision;
           SVN_ERR(check_repos_match(merge_b->target, local_abspath,
                                     copyfrom_url, scratch_pool));