subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1099746 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Date Thu, 05 May 2011 10:22:21 GMT
Author: rhuijben
Date: Thu May  5 10:22:21 2011
New Revision: 1099746

URL: http://svn.apache.org/viewvc?rev=1099746&view=rev
Log:
Fix a path calculation issue identified by the test added in r1099735.

* subversion/libsvn_wc/wc_db.c
  (get_info_for_copy): For deletes of BASE nodes, get the nodes own repository
    location instead of that of its top level BASE delete parent. For relpath
    calculations use relpath functions.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1099746&r1=1099745&r2=1099746&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu May  5 10:22:21 2011
@@ -2480,8 +2480,8 @@ get_info_for_copy(apr_int64_t *copyfrom_
         {
           *copyfrom_relpath
             = svn_relpath_join(*copyfrom_relpath,
-                               svn_dirent_skip_ancestor(op_root_relpath,
-                                                        local_relpath),
+                               svn_relpath_skip_ancestor(op_root_relpath,
+                                                         local_relpath),
                                result_pool);
         }
     }
@@ -2507,8 +2507,8 @@ get_info_for_copy(apr_int64_t *copyfrom_
                                 scratch_pool, scratch_pool));
           *copyfrom_relpath
             = svn_relpath_join(*copyfrom_relpath,
-                               svn_dirent_skip_ancestor(op_root_relpath,
-                                                        local_relpath),
+                               svn_relpath_skip_ancestor(op_root_relpath,
+                                                         local_relpath),
                                result_pool);
         }
       else if (base_del_relpath)
@@ -2517,7 +2517,7 @@ get_info_for_copy(apr_int64_t *copyfrom_
                                 copyfrom_id,
                                 NULL, NULL, NULL, NULL, NULL,
                                 NULL, NULL, NULL, NULL, NULL,
-                                wcroot, base_del_relpath,
+                                wcroot, local_relpath,
                                 result_pool, scratch_pool));
         }
       else



Mime
View raw message