You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/11/12 16:24:32 UTC
svn commit: r1034420 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Author: julianfoad
Date: Fri Nov 12 15:24:32 2010
New Revision: 1034420
URL: http://svn.apache.org/viewvc?rev=1034420&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(make_copy_txn): A bit more conversion from using abspaths to relpaths.
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=1034420&r1=1034419&r2=1034420&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Nov 12 15:24:32 2010
@@ -9110,18 +9110,14 @@ make_copy_txn(void *baton,
if (mcb->is_root && (add_working_normal || add_working_not_present))
{
- const char *repos_relpath, *repos_root_url, *repos_uuid;
+ const char *repos_relpath;
apr_int64_t repos_id;
/* Make sure the copy origin is set on the root even if the node
didn't have a local relpath */
- SVN_ERR(svn_wc__db_scan_base_repos(&repos_relpath, &repos_root_url,
- &repos_uuid, mcb->db,
- mcb->local_abspath,
- iterpool, iterpool));
-
- SVN_ERR(fetch_repos_id(&repos_id, repos_root_url, repos_uuid, sdb,
- iterpool));
+ SVN_ERR(scan_upwards_for_repos(&repos_id, &repos_relpath,
+ mcb->pdh->wcroot, mcb->local_relpath,
+ iterpool, iterpool));
/* ### this is not setting the COPYFROM_REVISION column!! */
/* ### The regression tests passed without this, is it necessary? */