Author: stsp
Date: Fri Feb 24 06:07:00 2012
New Revision: 1293096
URL: http://svn.apache.org/viewvc?rev=1293096&view=rev
Log:
On the multi-layer-moves branch, remove some redundant code.
* subversion/libsvn_wc/wc_db.c
(op_revert_txn): Moved-to is now stored in WORKING instead of BASE so we
don't need to explicitly delete moved-to after deleting the working node.
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=1293096&r1=1293095&r2=1293096&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 06:07:00 2012
@@ -5378,12 +5378,6 @@ op_revert_txn(void *baton,
/* 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));
-
- /* 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));
- SVN_ERR(svn_sqlite__step_done(stmt));
}
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
@@ -5515,12 +5509,6 @@ op_revert_recursive_txn(void *baton,
&& moved_here)
SVN_ERR(clear_moved_to(local_relpath, wcroot, scratch_pool));
- /* Clear any moved-to paths of potentially 'moved-away' nodes. */
- SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
- STMT_CLEAR_MOVED_TO_RELPATH_RECURSIVE));
- SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
- SVN_ERR(svn_sqlite__step_done(stmt));
-
return SVN_NO_ERROR;
}
