You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2012/12/21 17:49:34 UTC
svn commit: r1425025 -
/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Author: philip
Date: Fri Dec 21 16:49:34 2012
New Revision: 1425025
URL: http://svn.apache.org/viewvc?rev=1425025&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.h
(tc_editor_add_directory, tc_editor_add_file): Comment stuff todo.
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=1425025&r1=1425024&r2=1425025&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Fri Dec 21 16:49:34 2012
@@ -175,6 +175,8 @@ tc_editor_add_directory(void *baton,
if (is_conflicted)
return SVN_NO_ERROR;
+ /* TODO: check for obstructions and raise a conflict. */
+
SVN_ERR(svn_wc__wq_build_dir_install(&work_item, b->db,
svn_dirent_join(b->wcroot->abspath,
relpath,
@@ -209,6 +211,8 @@ tc_editor_add_file(void *baton,
if (is_conflicted)
return SVN_NO_ERROR;
+ /* TODO: check for obstructions and raise a conflict. */
+
SVN_ERR(svn_wc__wq_build_file_install(&work_item, b->db,
svn_dirent_join(b->wcroot->abspath,
relpath,