You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2011/01/27 06:04:59 UTC
svn commit: r1063993 -
/subversion/branches/uris-as-urls/subversion/libsvn_ra_svn/editorp.c
Author: cmpilato
Date: Thu Jan 27 05:04:58 2011
New Revision: 1063993
URL: http://svn.apache.org/viewvc?rev=1063993&view=rev
Log:
On the 'uris-as-urls' branch: Fix a slew of svnserve test failures.
* subversion/libsvn_ra_svn/editorp.c
(ra_svn_handle_add_dir, ra_svn_handle_add_file): I couldn't believe
it at the time, but I guess the copyfrom_url really *is* expected
to be a full URL, not just an fspath. Weird.
Modified:
subversion/branches/uris-as-urls/subversion/libsvn_ra_svn/editorp.c
Modified: subversion/branches/uris-as-urls/subversion/libsvn_ra_svn/editorp.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/libsvn_ra_svn/editorp.c?rev=1063993&r1=1063992&r2=1063993&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/libsvn_ra_svn/editorp.c (original)
+++ subversion/branches/uris-as-urls/subversion/libsvn_ra_svn/editorp.c Thu Jan 27 05:04:58 2011
@@ -524,7 +524,7 @@ static svn_error_t *ra_svn_handle_add_di
subpool = svn_pool_create(entry->pool);
path = svn_relpath_canonicalize(path, pool);
if (copy_path)
- copy_path = svn_fspath__canonicalize(copy_path, pool);
+ copy_path = svn_url_canonicalize(copy_path, pool);
SVN_CMD_ERR(ds->editor->add_directory(path, entry->baton, copy_path,
copy_rev, subpool, &child_baton));
store_token(ds, child_baton, child_token, FALSE, subpool);
@@ -622,7 +622,7 @@ static svn_error_t *ra_svn_handle_add_fi
ds->file_refs++;
path = svn_relpath_canonicalize(path, pool);
if (copy_path)
- copy_path = svn_fspath__canonicalize(copy_path, pool);
+ copy_path = svn_url_canonicalize(copy_path, pool);
file_entry = store_token(ds, NULL, file_token, TRUE, ds->file_pool);
SVN_CMD_ERR(ds->editor->add_file(path, entry->baton, copy_path, copy_rev,
ds->file_pool, &file_entry->baton));