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 2013/01/16 15:51:06 UTC
svn commit: r1433963 -
/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Author: philip
Date: Wed Jan 16 14:51:06 2013
New Revision: 1433963
URL: http://svn.apache.org/viewvc?rev=1433963&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c
(check_tree_conflict): Adjust both kinds when moving to parent.
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=1433963&r1=1433962&r2=1433963&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Wed Jan 16 14:51:06 2013
@@ -246,7 +246,7 @@ check_tree_conflict(svn_boolean_t *is_co
{
conflict_root_relpath = svn_relpath_dirname(conflict_root_relpath,
scratch_pool);
- old_kind = svn_node_dir;
+ old_kind = kind = svn_node_dir;
}
SVN_ERR(svn_wc__db_read_conflict_internal(&conflict, b->wcroot,