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/29 11:53:28 UTC
svn commit: r1771889 -
/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Author: stsp
Date: Tue Nov 29 11:53:28 2016
New Revision: 1771889
URL: http://svn.apache.org/viewvc?rev=1771889&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c
(tc_editor_merge_local_file_change): Fix incorrect use of node kind variable.
Found by: svn-windows-ra buildbot
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=1771889&r1=1771888&r2=1771889&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Tue Nov 29 11:53:28 2016
@@ -1491,7 +1491,7 @@ tc_editor_merge_local_file_change(node_m
conflict_skel == NULL)
{
SVN_ERR(create_node_tree_conflict(&conflict_skel, nmb, dst_relpath,
- svn_node_file, dst_kind_on_disk,
+ svn_node_file, dst_db_kind,
dst_db_kind == svn_node_none
? svn_wc_conflict_reason_missing
: svn_wc_conflict_reason_obstructed,