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/04 21:52:56 UTC
svn commit: r1429122 -
/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Author: julianfoad
Date: Fri Jan 4 20:52:55 2013
New Revision: 1429122
URL: http://svn.apache.org/viewvc?rev=1429122&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c
Tweak comments.
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=1429122&r1=1429121&r2=1429122&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Fri Jan 4 20:52:55 2013
@@ -95,7 +95,9 @@
* Receiver code.
*
* The receiver is an editor that, when driven with a certain change, will
- * merge the edits into the 'actual' layer of a moved subtree.
+ * merge the edits into the working/actual state of the move destination
+ * at MOVE_ROOT_DST_RELPATH (in struct tc_editor_baton), perhaps raising
+ * conflicts if necessary.
*/
struct tc_editor_baton {
@@ -819,13 +821,7 @@ tc_editor_abort(void *baton,
return SVN_NO_ERROR;
}
-/* An editor.
- *
- * This editor will merge the edits into the 'actual' tree at
- * MOVE_ROOT_DST_RELPATH (in struct tc_editor_baton),
- * perhaps raising conflicts if necessary.
- *
- */
+/* The editor callback table implementing the receiver. */
static const svn_editor_cb_many_t editor_ops = {
tc_editor_add_directory,
tc_editor_add_file,