You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2011/04/19 20:20:59 UTC
svn commit: r1095154 - in /subversion/trunk/subversion/libsvn_wc: wc_db.c
wc_db.h
Author: philip
Date: Tue Apr 19 18:20:58 2011
New Revision: 1095154
URL: http://svn.apache.org/viewvc?rev=1095154&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_op_revert_actual): Remove, it is obsolete.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/wc_db.h
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1095154&r1=1095153&r2=1095154&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Apr 19 18:20:58 2011
@@ -3814,47 +3814,6 @@ svn_wc__db_op_set_tree_conflict(svn_wc__
}
-svn_error_t *
-svn_wc__db_op_revert_actual(svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *scratch_pool)
-{
- svn_wc__db_wcroot_t *wcroot;
- const char *local_relpath;
- svn_sqlite__stmt_t *stmt;
- int affected_rows;
-
- SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
-
- SVN_ERR(svn_wc__db_wcroot_parse_local_abspath(&wcroot, &local_relpath, db,
- local_abspath, scratch_pool, scratch_pool));
- VERIFY_USABLE_WCROOT(wcroot);
-
- SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
- STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST));
- SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
- SVN_ERR(svn_sqlite__update(&affected_rows, stmt));
-
- if (affected_rows == 0)
- {
- /* Failed to delete the row.
- Presumably because there was a changelist set on it */
-
- SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
- STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST));
- SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
- SVN_ERR(svn_sqlite__step_done(stmt));
- /* We're not interested here if there was an affected row or not:
- If there isn't by now, then there simply was no row to begin with */
- }
-
- /* Some entries have cached the above values. Kapow!! */
- SVN_ERR(flush_entries(wcroot, local_abspath, scratch_pool));
-
- return SVN_NO_ERROR;
-}
-
-
/* This implements svn_wc__db_txn_callback_t */
static svn_error_t *
op_revert_txn(void *baton,
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1095154&r1=1095153&r2=1095154&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Tue Apr 19 18:20:58 2011
@@ -1281,17 +1281,6 @@ svn_wc__db_op_mark_resolved(svn_wc__db_t
/* Revert all local changes which are being maintained in the database,
- * including conflict storage, properties and text modification status,
- * but excluding changelist association.
- */
-svn_error_t *
-svn_wc__db_op_revert_actual(svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *scratch_pool);
-
-
-
-/* Revert all local changes which are being maintained in the database,
* including conflict storage, properties and text modification status.
*
* Returns SVN_ERR_WC_INVALID_OPERATION_DEPTH if the revert is not