Author: philip
Date: Fri Aug 22 09:36:43 2014
New Revision: 1619719
URL: http://svn.apache.org/r1619719
Log:
* subversion/libsvn_wc/update_editor.c
(absent_node): Fix thinko, switch old and new kind in 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=1619719&r1=1619718&r2=1619719&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Fri Aug 22 09:36:43
2014
@@ -3102,7 +3102,7 @@ absent_node(const char *path,
if (tree_conflict)
SVN_ERR(complete_conflict(tree_conflict, eb, local_abspath,
NULL, SVN_INVALID_REVNUM, repos_relpath,
- svn_node_unknown, kind,
+ kind, svn_node_unknown,
scratch_pool, scratch_pool));
