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

[ju...@apache.org]

Author: julianfoad
Date: Tue Nov 13 16:34:22 2012
New Revision: 1408826

URL: http://svn.apache.org/viewvc?rev=1408826&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c
  (get_tc_info, update_moved_away_file, update_moved_away_dir,
   update_moved_away_subtree, drive_tree_conflict_editor,
   update_moved_away_conflict_victim): Add skeleton doc strings.

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=1408826&r1=1408825&r2=1408826&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Tue Nov 13 16:34:22 2012
@@ -431,6 +431,11 @@ static const svn_editor_cb_many_t editor
  * Driver code.
  */
 
+/* Set *OPERATION, *LOCAL_CHANGE, *INCOMING_CHANGE, *OLD_VERSION, *NEW_VERSION
+ * to reflect the tree conflict on the victim SRC_ABSPATH in DB.
+ *
+ * If SRC_ABSPATH is not a tree-conflict victim, return an error.
+ */
 static svn_error_t *
 get_tc_info(svn_wc_operation_t *operation,
             svn_wc_conflict_reason_t *local_change,
@@ -510,6 +515,8 @@ get_tc_info(svn_wc_operation_t *operatio
   return SVN_NO_ERROR;
 }
 
+/* ### Drive TC_EDITOR so as to ...
+ */
 static svn_error_t *
 update_moved_away_file(svn_editor_t *tc_editor,
                        const char *src_relpath,
@@ -545,6 +552,8 @@ update_moved_away_file(svn_editor_t *tc_
   return SVN_NO_ERROR;
 }
 
+/* ### Drive TC_EDITOR so as to ...
+ */
 static svn_error_t *
 update_moved_away_dir(svn_editor_t *tc_editor,
                       const char *src_relpath,
@@ -564,6 +573,8 @@ update_moved_away_dir(svn_editor_t *tc_e
   return SVN_NO_ERROR;
 }
 
+/* ### Drive TC_EDITOR so as to ...
+ */
 static svn_error_t *
 update_moved_away_subtree(svn_editor_t *tc_editor,
                           const char *src_relpath,
@@ -639,6 +650,8 @@ update_moved_away_subtree(svn_editor_t *
   return SVN_NO_ERROR;
 }
 
+/* ### Drive TC_EDITOR so as to ...
+ */
 static svn_error_t *
 drive_tree_conflict_editor(svn_editor_t *tc_editor,
                            const char *src_relpath,
@@ -708,7 +721,8 @@ struct update_moved_away_conflict_victim
   apr_pool_t *result_pool;
 };
 
-/* An implementation of svn_wc__db_txn_callback_t. */
+/* The body of svn_wc__db_update_moved_away_conflict_victim(), which see.
+ * An implementation of svn_wc__db_txn_callback_t. */
 static svn_error_t *
 update_moved_away_conflict_victim(void *baton,
                                   svn_wc__db_wcroot_t *wcroot,