You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/04/29 22:35:46 UTC
svn commit: r1097943 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c
Author: rhuijben
Date: Fri Apr 29 20:35:46 2011
New Revision: 1097943
URL: http://svn.apache.org/viewvc?rev=1097943&view=rev
Log:
* subversion/libsvn_wc/adm_ops.c
(svn_wc_get_pristine_copy_path): Make sure our non existent path uses the
real administrative directory instead of just .svn tagged to the
directory where the file lives in.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1097943&r1=1097942&r2=1097943&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Fri Apr 29 20:35:46 2011
@@ -1832,11 +1832,14 @@ svn_wc_get_pristine_copy_path(const char
pool, pool);
if (err && err->apr_err == SVN_ERR_WC_PATH_UNEXPECTED_STATUS)
{
- const char *adm_abspath = svn_dirent_dirname(local_abspath, pool);
-
+ const char *adm_abspath;
svn_error_clear(err);
+
+ SVN_ERR(svn_wc__db_get_wcroot(&adm_abspath, db, local_abspath,
+ pool, pool));
+
*pristine_path = svn_wc__nonexistent_path(db, adm_abspath, pool);
- return SVN_NO_ERROR;
+ return svn_error_return(svn_wc__db_close(db));
}
SVN_ERR(err);