Author: stsp
Date: Tue Jul 6 11:01:22 2010
New Revision: 960870
URL: http://svn.apache.org/viewvc?rev=960870&view=rev
Log:
* subversion/libsvn_client/patch.c
(resolve_target_path): Return immediately after marking a target as skipped.
Modified:
subversion/trunk/subversion/libsvn_client/patch.c
Modified: subversion/trunk/subversion/libsvn_client/patch.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/patch.c?rev=960870&r1=960869&r2=960870&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Tue Jul 6 11:01:22 2010
@@ -379,13 +379,19 @@ resolve_target_path(patch_target_t *targ
SVN_ERR(svn_wc_read_kind(&target->db_kind, wc_ctx, target->local_abspath,
FALSE, scratch_pool));
if (target->db_kind == svn_node_dir)
- target->skipped = TRUE;
- /* ### We cannot yet replace a locally deleted dir with a file,
- * ### but some day we might want to allow it. */
+ {
+ /* ### We cannot yet replace a locally deleted dir with a file,
+ * ### but some day we might want to allow it. */
+ target->skipped = TRUE;
+ return SVN_NO_ERROR;
+ }
/* ### Shouldn't libsvn_wc flag an obstruction in this case? */
if (target->locally_deleted && target->kind_on_disk != svn_node_none)
- target->skipped = TRUE;
+ {
+ target->skipped = TRUE;
+ return SVN_NO_ERROR;
+ }
if (target->kind_on_disk == svn_node_file)
SVN_ERR(resolve_target_wc_file_info(wc_ctx, target->local_abspath,
