Author: svn-role
Date: Sat Nov 22 04:00:37 2014
New Revision: 1641028
URL: http://svn.apache.org/r1641028
Log:
Merge r1591123 from trunk:
* r1591123
Display the proper URL for 'svn rm URL' in the commit log editor.
Justification:
It's confusing since the URL isn't what the user passed. Regression since
1.7.9 when we fixed issue #4332.
Votes:
+1: breser, rhuijben, julianfoad
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_client/delete.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1591123
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1641028&r1=1641027&r2=1641028&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sat Nov 22 04:00:37 2014
@@ -153,14 +153,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1591123
- Display the proper URL for 'svn rm URL' in the commit log editor.
- Justification:
- It's confusing since the URL isn't what the user passed. Regression since
- 1.7.9 when we fixed issue #4332.
- Votes:
- +1: breser, rhuijben, julianfoad
-
* r1462041
Fix issue issue 4339, diff suffix scanning invalid read at last chunk
boundary.
Modified: subversion/branches/1.7.x/subversion/libsvn_client/delete.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_client/delete.c?rev=1641028&r1=1641027&r2=1641028&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_client/delete.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_client/delete.c Sat Nov 22
04:00:37 2014
@@ -143,7 +143,7 @@ path_driver_cb_func(void **dir_baton,
static svn_error_t *
single_repos_delete(svn_ra_session_t *ra_session,
- const char *repos_root,
+ const char *base_uri,
const apr_array_header_t *relpaths,
const apr_hash_t *revprop_table,
svn_commit_callback2_t commit_callback,
@@ -171,7 +171,7 @@ single_repos_delete(svn_ra_session_t *ra
const char *relpath = APR_ARRAY_IDX(relpaths, i, const char *);
item = svn_client_commit_item3_create(pool);
- item->url = svn_path_url_add_component2(repos_root, relpath, pool);
+ item->url = svn_path_url_add_component2(base_uri, relpath, pool);
item->state_flags = SVN_CLIENT_COMMIT_ITEM_DELETE;
APR_ARRAY_PUSH(commit_items, svn_client_commit_item3_t *) = item;
}
@@ -311,7 +311,6 @@ delete_urls_multi_repos(const apr_array_
iterpool = svn_pool_create(pool);
for (hi = apr_hash_first(pool, deletables); hi; hi = apr_hash_next(hi))
{
- const char *repos_root = svn__apr_hash_index_key(hi);
struct repos_deletables_t *repos_deletables =
svn__apr_hash_index_val(hi);
const char *base_uri;
apr_array_header_t *target_relpaths;
@@ -348,7 +347,7 @@ delete_urls_multi_repos(const apr_array_
}
SVN_ERR(svn_ra_reparent(repos_deletables->ra_session, base_uri, pool));
- SVN_ERR(single_repos_delete(repos_deletables->ra_session, repos_root,
+ SVN_ERR(single_repos_delete(repos_deletables->ra_session, base_uri,
target_relpaths,
revprop_table, commit_callback,
commit_baton, ctx, iterpool));
