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

[ju...@apache.org]

Author: julianfoad
Date: Mon Dec  3 23:17:02 2012
New Revision: 1416722

URL: http://svn.apache.org/viewvc?rev=1416722&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c:
  (tc_editor_baton, editor_ops, drive_tree_conflict_editor): Fix a factual error
    in the comments I added very recently.

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=1416722&r1=1416721&r2=1416722&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Mon Dec  3 23:17:02 2012
@@ -54,9 +54,8 @@
 /*
  * Receiver code.
  *
- * The receiver is an editor that, when driven with a certain change, edits
- * the 'base' layer of a moved subtree subtree, and also merges those same
- * edits into its 'actual' layer.
+ * The receiver is an editor that, when driven with a certain change, will
+ * merge the edits into the 'actual' layer of a moved subtree.
  */
 
 struct tc_editor_baton {
@@ -416,10 +415,8 @@ tc_editor_abort(void *baton,
 
 /* An editor.
  *
- * This editor will (referring to fields in struct tc_editor_baton):
- *
- * Edit the MOVE_ROOT_DST_RELPATH subtree (at the op-depth of its op-root).
- * Merge those same edits into the MOVE_ROOT_DST_RELPATH 'actual' tree,
+ * 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.
  *
  */
@@ -757,6 +754,10 @@ replace_moved_layer(const char *src_relp
  * Drive the editor TC_EDITOR with the difference between DST_RELPATH
  * (at its own op-depth) and SRC_RELPATH (at op-depth zero).
  *
+ * Then update the single op-depth layer in the move destination subtree
+ * rooted at DST_RELPATH to make it match the move source subtree
+ * rooted at SRC_RELPATH.
+ *
  * ### And the other params?
  */
 static svn_error_t *