Author: hwright
Date: Sun May 6 03:39:51 2012
New Revision: 1334545
URL: http://svn.apache.org/viewvc?rev=1334545&view=rev
Log:
On the ev2-export branch:
Calculate and use the proper repos_relpath to indicate a copy source during
commit.
* subversion/libsvn_client/commit_util.c
(do_item_commit): As above.
Modified:
subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c
Modified: subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c?rev=1334545&r1=1334544&r2=1334545&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c
(original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c Sun
May 6 03:39:51 2012
@@ -1672,7 +1672,10 @@ do_item_commit(svn_client_commit_item3_t
if (item->state_flags & SVN_CLIENT_COMMIT_ITEM_IS_COPY)
{
- SVN_ERR(svn_editor_copy(editor, item->copyfrom_url, item->copyfrom_rev,
+ const char *src_relpath = svn_uri_skip_ancestor(repos_root,
+ item->copyfrom_url,
+ scratch_pool);
+ SVN_ERR(svn_editor_copy(editor, src_relpath, item->copyfrom_rev,
repos_relpath, SVN_INVALID_REVNUM));
}
