You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by eh...@apache.org on 2010/10/08 15:50:50 UTC
svn commit: r1005824 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c
Author: ehu
Date: Fri Oct 8 13:50:50 2010
New Revision: 1005824
URL: http://svn.apache.org/viewvc?rev=1005824&view=rev
Log:
* subversion/libsvn_wc/adm_ops.c (revert_entry): Remove duplication.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1005824&r1=1005823&r2=1005824&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Fri Oct 8 13:50:50 2010
@@ -1249,7 +1249,8 @@ revert_entry(svn_depth_t *depth,
### shoved back into the database. this is why we need to record
### the repository information, and the BASE revision. */
- if (kind == svn_wc__db_kind_file)
+ if (kind == svn_wc__db_kind_file
+ || kind == svn_wc__db_kind_dir)
{
SVN_ERR(svn_wc__internal_remove_from_revision_control(db,
local_abspath,
@@ -1258,17 +1259,6 @@ revert_entry(svn_depth_t *depth,
cancel_baton,
pool));
}
- else if (kind == svn_wc__db_kind_dir)
- {
- /* Before single-db we didn't have to perform a recursive delete
- here. With single-db we really must delete missing nodes */
- SVN_ERR(svn_wc__internal_remove_from_revision_control(db,
- local_abspath,
- FALSE, FALSE,
- cancel_func,
- cancel_baton,
- pool));
- }
else /* Else it's `none', or something exotic like a symlink... */
{
return svn_error_createf(SVN_ERR_NODE_UNKNOWN_KIND, NULL,