subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1296045 - /subversion/trunk/subversion/libsvn_client/commit.c
Date Fri, 02 Mar 2012 04:00:26 GMT
Author: hwright
Date: Fri Mar  2 04:00:26 2012
New Revision: 1296045

URL: http://svn.apache.org/viewvc?rev=1296045&view=rev
Log:
Ev2: Correct the way we calculate the anchor abspath when doing a commit.

Current number of test failures over ra_svn: 483

* subversion/libsvn_client/commit.c
  (get_ra_editor): Calculate the anchor_abspath using the wcroot abspath.

Modified:
    subversion/trunk/subversion/libsvn_client/commit.c

Modified: subversion/trunk/subversion/libsvn_client/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit.c?rev=1296045&r1=1296044&r2=1296045&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit.c Fri Mar  2 04:00:26 2012
@@ -675,10 +675,14 @@ get_ra_editor(svn_ra_session_t **ra_sess
   if (base_dir_abspath)
     {
       const char *relpath;
+      const char *wcroot_abspath;
+
+      SVN_ERR(svn_wc__get_wc_root(&wcroot_abspath, ctx->wc_ctx,
+                                  base_dir_abspath, pool, pool));
 
       SVN_ERR(svn_ra_get_path_relative_to_root(*ra_session, &relpath, base_url,
                                                pool));
-      anchor_abspath = svn_dirent_join(base_dir_abspath, relpath, pool);
+      anchor_abspath = svn_dirent_join(wcroot_abspath, relpath, pool);
     }
   else
     anchor_abspath = NULL;



Mime
View raw message