Author: philip
Date: Mon Apr 4 15:45:28 2011
New Revision: 1088664
URL: http://svn.apache.org/viewvc?rev=1088664&view=rev
Log:
* subversion/libsvn_wc/adm_ops.c
(revert_restore): Don't try to verify nodes that are not expected
to be present in the working copy.
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=1088664&r1=1088663&r2=1088664&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Mon Apr 4 15:45:28 2011
@@ -1420,7 +1420,11 @@ revert_restore(svn_wc__db_t *db,
SVN_ERR(svn_io_check_special_path(local_abspath, &on_disk, &special,
scratch_pool));
- if (on_disk != svn_node_none)
+ if (on_disk != svn_node_none
+ && status != svn_wc__db_status_absent
+ && status != svn_wc__db_status_deleted
+ && status != svn_wc__db_status_excluded
+ && status != svn_wc__db_status_not_present)
{
if (on_disk == svn_node_dir && kind != svn_wc__db_kind_dir)
{
