Author: hwright
Date: Sat Apr 14 19:32:16 2012
New Revision: 1326187
URL: http://svn.apache.org/viewvc?rev=1326187&view=rev
Log:
On the ev2-export branch:
Work on issue 898: Implement real moves for repos->repos operations.
* subversion/libsvn_client/copy.c
(drive_single_path): Use a bona fide move editor action for moved paths,
rather than delete + copy.
Modified:
subversion/branches/ev2-export/subversion/libsvn_client/copy.c
Modified: subversion/branches/ev2-export/subversion/libsvn_client/copy.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/copy.c?rev=1326187&r1=1326186&r2=1326187&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/copy.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/copy.c Sat Apr 14
19:32:16 2012
@@ -582,8 +582,15 @@ drive_single_path(svn_editor_t *editor,
a delete + add. */
if (is_move)
{
- SVN_ERR(svn_editor_delete(editor, path_info->src_relpath,
- SVN_INVALID_REVNUM));
+ SVN_ERR(svn_editor_move(editor, path_info->src_relpath,
+ path_info->src_revnum, path_info->dst_relpath,
+ SVN_INVALID_REVNUM));
+ }
+ else
+ {
+ SVN_ERR(svn_editor_copy(editor, path_info->src_relpath,
+ path_info->src_revnum, path_info->dst_relpath,
+ SVN_INVALID_REVNUM));
}
/* ### Need to get existing props, rather than just set mergeinfo
@@ -592,10 +599,6 @@ drive_single_path(svn_editor_t *editor,
apr_hash_set(props, SVN_PROP_MERGEINFO, APR_HASH_KEY_STRING,
path_info->mergeinfo);
- SVN_ERR(svn_editor_copy(editor, path_info->src_relpath,
- path_info->src_revnum, path_info->dst_relpath,
- SVN_INVALID_REVNUM));
-
if (path_info->src_kind == svn_node_file)
SVN_ERR(svn_editor_alter_file(editor, path_info->dst_relpath,
SVN_INVALID_REVNUM, props, NULL, NULL));
