Author: danielsh
Date: Thu Mar 31 03:35:06 2011
New Revision: 1087171
URL: http://svn.apache.org/viewvc?rev=1087171&view=rev
Log:
Minor consistency fix / optimization.
* subversion/libsvn_wc/workqueue.c
(svn_wc__wq_add_revert):
Don't call svn_wc__db_scan_addition() when its result won't be used.
Modified:
subversion/trunk/subversion/libsvn_wc/workqueue.c
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=1087171&r1=1087170&r2=1087171&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Thu Mar 31 03:35:06 2011
@@ -414,7 +414,7 @@ svn_wc__wq_add_revert(svn_boolean_t *wil
svn_node_kind_t on_disk;
SVN_ERR(svn_io_check_path(local_abspath, &on_disk, scratch_pool));
- reinstall_working = on_disk == svn_node_none;
+ reinstall_working = (on_disk == svn_node_none);
*will_revert = *will_revert || reinstall_working;
}
@@ -431,7 +431,8 @@ svn_wc__wq_add_revert(svn_boolean_t *wil
}
- if (status == svn_wc__db_status_added)
+ if (! remove_working
+ && status == svn_wc__db_status_added)
{
/* When looking at an added, non-replacing node, its entry
will have to be removed after revert: if not, it'll look
