diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2018-05-08 03:44:38 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2018-05-08 03:44:38 +0000 |
| commit | 3faf8d6bffc5d0fb2525ba37bb504c53366caf9d (patch) | |
| tree | 7e47911263e75034b767fe34b2f8d3d17e91f66d /subversion/libsvn_wc/copy.c | |
| parent | a55fb3c0d5eca7d887798125d5b95942b1f01d4b (diff) | |
Diffstat (limited to 'subversion/libsvn_wc/copy.c')
| -rw-r--r-- | subversion/libsvn_wc/copy.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/subversion/libsvn_wc/copy.c b/subversion/libsvn_wc/copy.c index 30a0db58cc6a3..7d4256feabad6 100644 --- a/subversion/libsvn_wc/copy.c +++ b/subversion/libsvn_wc/copy.c @@ -791,10 +791,11 @@ copy_or_move(svn_boolean_t *record_move_on_delete, break; /* OK to add */ default: - return svn_error_createf(SVN_ERR_ENTRY_EXISTS, NULL, - _("There is already a versioned item '%s'"), - svn_dirent_local_style(dst_abspath, - scratch_pool)); + if (!metadata_only) + return svn_error_createf(SVN_ERR_ENTRY_EXISTS, NULL, + _("There is already a versioned item '%s'"), + svn_dirent_local_style(dst_abspath, + scratch_pool)); } } @@ -1104,8 +1105,8 @@ svn_wc__move2(svn_wc_context_t *wc_ctx, { svn_error_t *err; - err = svn_error_trace(svn_io_file_rename(src_abspath, dst_abspath, - scratch_pool)); + err = svn_error_trace(svn_io_file_rename2(src_abspath, dst_abspath, + FALSE, scratch_pool)); /* Let's try if we can keep wc.db consistent even when the move fails. Deleting the target is a wc.db only operation, while |