svn commit: r1293092 - /subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c

[st...@apache.org]

Author: stsp
Date: Fri Feb 24 05:44:59 2012
New Revision: 1293092

URL: http://svn.apache.org/viewvc?rev=1293092&view=rev
Log:
On the multi-layer-moves branch, tweak some comments.

* subversion/libsvn_wc/wc_db.c
  (op_revert_txn, op_delete_baton_t): Comment tweaks.

Modified:
    subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c

Modified: subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c?rev=1293092&r1=1293091&r2=1293092&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c Fri Feb 24 05:44:59 2012
@@ -5375,10 +5375,11 @@ op_revert_txn(void *baton,
       SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
       SVN_ERR(svn_sqlite__step_done(stmt));
 
+      /* If this node was moved-here, clear moved-to at the move source. */
       if (moved_here)
         SVN_ERR(clear_moved_to(local_relpath, wcroot, scratch_pool));
 
-      /* Clear the moved-to path of the BASE node. */
+      /* In case this node was moved-away, clear its moved-to path. */
       SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
                                         STMT_CLEAR_MOVED_TO_RELPATH));
       SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
@@ -6316,6 +6317,12 @@ struct op_delete_baton_t {
  *   mv B/F B/G
  * We do not care about the order the moves were performed in.
  *
+ * Another example is a move of a subtree which had nodes moved into it:
+ *   mv A B/F
+ *   mv B G
+ * This requires rewriting such that A/F is marked has having moved
+ * to G/F.
+ *
  * For details, see http://wiki.apache.org/subversion/MultiLayerMoves
  */
 struct moved_node_t {