svn commit: r1424597 - /subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c

[philip]

Author: philip
Date: Thu Dec 20 17:29:20 2012
New Revision: 1424597

URL: http://svn.apache.org/viewvc?rev=1424597&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c
  (check_tree_conflict): Add kind parameter, create conflict version
   with correct kind.
  (tc_editor_alter_directory, tc_editor_alter_file): Pass kind.

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=1424597&r1=1424596&r2=1424597&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Thu Dec 20 
17:29:20 2012
@@ -226,6 +226,7 @@ static svn_error_t *
 check_tree_conflict(svn_boolean_t *is_conflicted,
                     struct tc_editor_baton *b,
                     const char *local_relpath,
+                    svn_node_kind_t kind,
                     apr_pool_t *scratch_pool)
 {
   svn_sqlite__stmt_t *stmt;
@@ -235,6 +236,7 @@ check_tree_conflict(svn_boolean_t *is_co
   const char *conflict_root_relpath = local_relpath;
   const char *moved_to_relpath;
   svn_skel_t *conflict;
+  svn_wc_conflict_version_t *version;
 
   SVN_ERR(svn_sqlite__get_statement(&stmt, b->wcroot->sdb,
                                     STMT_SELECT_LOWEST_WORKING_NODE));
@@ -282,7 +284,14 @@ check_tree_conflict(svn_boolean_t *is_co
                      scratch_pool,
                      scratch_pool));
 
-  SVN_ERR(svn_wc__conflict_skel_set_op_update(conflict, b->old_version,
+  version = svn_wc_conflict_version_create2(b->old_version->repos_url,
+                                            b->old_version->repos_uuid,
+                                            local_relpath,
+                                            b->old_version->peg_rev,
+                                            kind,
+                                            scratch_pool);
+
+  SVN_ERR(svn_wc__conflict_skel_set_op_update(conflict, version,
                                               scratch_pool, scratch_pool));
   SVN_ERR(svn_wc__db_mark_conflict_internal(b->wcroot, conflict_root_relpath,
                                             conflict, scratch_pool));
@@ -309,7 +318,8 @@ tc_editor_alter_directory(void *baton,
 
   SVN_ERR_ASSERT(expected_move_dst_revision == b->old_version->peg_rev);
 
-  SVN_ERR(check_tree_conflict(&is_conflicted, b, dst_relpath, scratch_pool));
+  SVN_ERR(check_tree_conflict(&is_conflicted, b, dst_relpath, svn_node_dir,
+                              scratch_pool));
   if (is_conflicted)
     return SVN_NO_ERROR;
 
@@ -529,7 +539,8 @@ tc_editor_alter_file(void *baton,
   working_node_version_t old_version, new_version;
   svn_boolean_t is_conflicted;
 
-  SVN_ERR(check_tree_conflict(&is_conflicted, b, dst_relpath, scratch_pool));
+  SVN_ERR(check_tree_conflict(&is_conflicted, b, dst_relpath, svn_node_file,
+                              scratch_pool));
   if (is_conflicted)
     return SVN_NO_ERROR;