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/11/26 13:36:27 UTC
svn commit: r1771483 -
/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Author: stsp
Date: Sat Nov 26 13:36:27 2016
New Revision: 1771483
URL: http://svn.apache.org/viewvc?rev=1771483&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c
(tc_editor_incoming_add_file): No need to check for shadowed nodes here.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1771483&r1=1771482&r2=1771483&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Sat Nov 26 13:36:27 2016
@@ -984,8 +984,7 @@ tc_editor_incoming_add_file(node_move_ba
/* Check for unversioned tree-conflict */
SVN_ERR(svn_io_check_path(dst_abspath, &wc_kind, scratch_pool));
- if (wc_kind != svn_node_none
- && (nmb->shadowed || wc_kind != old_kind)) /* replace */
+ if (wc_kind != svn_node_none && wc_kind != old_kind) /* replace */
{
SVN_ERR(create_node_tree_conflict(&conflict, nmb, dst_relpath,
old_kind, svn_node_file,