You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/01/13 16:37:21 UTC
svn commit: r1432642 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Author: rhuijben
Date: Sun Jan 13 15:37:21 2013
New Revision: 1432642
URL: http://svn.apache.org/viewvc?rev=1432642&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
(add_directory,
add_file): Pass the right kind type to complete_conflict.
Modified:
subversion/trunk/subversion/libsvn_wc/update_editor.c
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1432642&r1=1432641&r2=1432642&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Sun Jan 13 15:37:21 2013
@@ -2146,7 +2146,8 @@ add_directory(const char *path,
SVN_ERR(complete_conflict(tree_conflict, pb, db->local_abspath,
db->old_repos_relpath, db->old_revision,
db->new_relpath,
- wc_kind, svn_node_dir,
+ svn__node_kind_from_kind(wc_kind),
+ svn_node_dir,
db->pool, pool));
SVN_ERR(svn_wc__db_base_add_incomplete_directory(
@@ -3241,7 +3242,8 @@ add_file(const char *path,
fb->old_repos_relpath,
fb->old_revision,
fb->new_relpath,
- wc_kind, svn_node_file,
+ svn__node_kind_from_kind(wc_kind),
+ svn_node_file,
fb->pool, scratch_pool));
SVN_ERR(svn_wc__db_op_mark_conflict(eb->db,