Author: stsp
Date: Mon Jan 7 17:14:30 2013
New Revision: 1429904
URL: http://svn.apache.org/viewvc?rev=1429904&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
(add_directory, add_file): When flagging a tree conflict, properly record
the local node kind in the tree conflict description, instead of recording
the node kind of the incoming change as the local kind.
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=1429904&r1=1429903&r2=1429904&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Mon Jan 7 17:14:30
2013
@@ -2107,7 +2107,7 @@ add_directory(const char *path,
SVN_ERR(complete_conflict(tree_conflict, pb, db->local_abspath,
db->old_repos_relpath, db->old_revision,
- svn_node_dir, db->pool, pool));
+ wc_kind, db->pool, pool));
SVN_ERR(svn_wc__db_base_add_incomplete_directory(
eb->db, db->local_abspath,
@@ -3193,7 +3193,7 @@ add_file(const char *path,
fb->local_abspath,
fb->old_repos_relpath,
fb->old_revision,
- svn_node_file,
+ wc_kind,
fb->pool, scratch_pool));
SVN_ERR(svn_wc__db_op_mark_conflict(eb->db,
