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/04 18:17:41 UTC
svn commit: r1088673 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c
Author: philip
Date: Mon Apr 4 16:17:41 2011
New Revision: 1088673
URL: http://svn.apache.org/viewvc?rev=1088673&view=rev
Log:
* subversion/libsvn_wc/adm_ops.c (revert_restore): Add a couple of comments.
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=1088673&r1=1088672&r2=1088673&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Mon Apr 4 16:17:41 2011
@@ -1420,6 +1420,9 @@ revert_restore(svn_wc__db_t *db,
SVN_ERR(svn_io_check_special_path(local_abspath, &on_disk, &special,
scratch_pool));
+ /* If we expect a versioned item to be present then check that any
+ item on disk matches the versioned item, if it doesn't match then
+ fix it or delete it. */
if (on_disk != svn_node_none
&& status != svn_wc__db_status_absent
&& status != svn_wc__db_status_deleted
@@ -1510,6 +1513,8 @@ revert_restore(svn_wc__db_t *db,
}
}
+ /* If we expect a versioned item to be present and there is nothing
+ on disk then recreate it. */
if (on_disk == svn_node_none
&& status != svn_wc__db_status_absent
&& status != svn_wc__db_status_deleted