You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2016/06/13 13:00:10 UTC
svn commit: r1748211 - /subversion/trunk/subversion/libsvn_wc/copy.c
Author: stsp
Date: Mon Jun 13 13:00:10 2016
New Revision: 1748211
URL: http://svn.apache.org/viewvc?rev=1748211&view=rev
Log:
* subversion/libsvn_client/copy.c
(copy_or_move): Allow a versioned item to exist at the destination in
case of a meta-data only copy or move. This feature will be used by
the conflict resolver.
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=1748211&r1=1748210&r2=1748211&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/copy.c (original)
+++ subversion/trunk/subversion/libsvn_wc/copy.c Mon Jun 13 13:00:10 2016
@@ -791,10 +791,11 @@ copy_or_move(svn_boolean_t *record_move_
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));
}
}