You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/05/28 18:18:04 UTC
svn commit: r949215 - /subversion/trunk/subversion/libsvn_wc/copy.c
Author: philip
Date: Fri May 28 16:18:04 2010
New Revision: 949215
URL: http://svn.apache.org/viewvc?rev=949215&view=rev
Log:
* subversion/libsvn_wc/copy.c
(copy_file): Rename to ...
(copy_versioned_file): ... this.
(svn_wc_copy3): Adjust caller.
Modified:
subversion/trunk/subversion/libsvn_wc/copy.c
Modified: subversion/trunk/subversion/libsvn_wc/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/copy.c?rev=949215&r1=949214&r2=949215&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/copy.c (original)
+++ subversion/trunk/subversion/libsvn_wc/copy.c Fri May 28 16:18:04 2010
@@ -739,14 +739,14 @@ copy_dir_administratively(svn_wc_context
copy_added_file_administratively. Not yet fully working. Relies
on in-db-props. */
static svn_error_t *
-copy_file(svn_wc_context_t *wc_ctx,
- const char *src_abspath,
- const char *dst_abspath,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- svn_wc_notify_func2_t notify_func,
- void *notify_baton,
- apr_pool_t *scratch_pool)
+copy_versioned_file(svn_wc_context_t *wc_ctx,
+ const char *src_abspath,
+ const char *dst_abspath,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ svn_wc_notify_func2_t notify_func,
+ void *notify_baton,
+ apr_pool_t *scratch_pool)
{
svn_skel_t *work_items = NULL;
const char *dir_abspath = svn_dirent_dirname(dst_abspath, scratch_pool);
@@ -963,9 +963,10 @@ svn_wc_copy3(svn_wc_context_t *wc_ctx,
}
- SVN_ERR(copy_file(wc_ctx, src_abspath, dst_abspath,
- cancel_func, cancel_baton, notify_func, notify_baton,
- scratch_pool));
+ SVN_ERR(copy_versioned_file(wc_ctx, src_abspath, dst_abspath,
+ cancel_func, cancel_baton,
+ notify_func, notify_baton,
+ scratch_pool));
#endif
}
else if (src_kind == svn_node_dir)