You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2013/01/08 16:58:07 UTC
svn commit: r1430344 -
/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Author: julianfoad
Date: Tue Jan 8 15:58:07 2013
New Revision: 1430344
URL: http://svn.apache.org/viewvc?rev=1430344&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c
Note some issues that need fixing.
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=1430344&r1=1430343&r2=1430344&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Tue Jan 8 15:58:07 2013
@@ -372,6 +372,9 @@ typedef struct working_node_version_t
const svn_checksum_t *checksum; /* for files only */
} working_node_version_t;
+/* ### ...
+ * ### need to pass in the node kinds (before & after)?
+ */
static svn_error_t *
create_conflict_markers(svn_skel_t **work_items,
const char *local_abspath,
@@ -389,7 +392,7 @@ create_conflict_markers(svn_skel_t **wor
original_version = svn_wc_conflict_version_dup(
old_version->location_and_kind, scratch_pool);
original_version->path_in_repos = repos_relpath;
- original_version->node_kind = svn_node_file;
+ original_version->node_kind = svn_node_file; /* ### ? */
SVN_ERR(svn_wc__conflict_skel_set_op_update(conflict_skel,
original_version,
NULL /* ### derive from new_version & new kind? */,
@@ -508,6 +511,7 @@ tc_editor_alter_directory(void *baton,
if (conflict_skel)
{
+ /* ### need to pass in the node kinds (before & after)? */
SVN_ERR(create_conflict_markers(b->work_items, dst_abspath,
b->db, move_dst_repos_relpath,
conflict_skel,
@@ -585,6 +589,7 @@ update_working_file(svn_skel_t **work_it
* too. */
if (conflict_skel)
{
+ /* ### need to pass in the node kinds (before & after)? */
SVN_ERR(create_conflict_markers(work_items, local_abspath, db,
repos_relpath, conflict_skel,
old_version, new_version,
@@ -624,6 +629,7 @@ update_working_file(svn_skel_t **work_it
* too. */
if (conflict_skel)
{
+ /* ### need to pass in the node kinds (before & after)? */
SVN_ERR(create_conflict_markers(work_items, local_abspath, db,
repos_relpath, conflict_skel,
old_version, new_version,