Author: cmpilato
Date: Mon Jun 25 15:01:19 2012
New Revision: 1353587
URL: http://svn.apache.org/viewvc?rev=1353587&view=rev
Log:
Re-allow 'svn update *' to deal with unversioned targets.
* subversion/libsvn_client/update.c
(svn_client_update4): Also ignore SVN_ERR_WC_PATH_NOT_FOUND returned
from svn_wc__resolve_conflicts().
Modified:
subversion/trunk/subversion/libsvn_client/update.c
Modified: subversion/trunk/subversion/libsvn_client/update.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/update.c?rev=1353587&r1=1353586&r2=1353587&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/update.c (original)
+++ subversion/trunk/subversion/libsvn_client/update.c Mon Jun 25 15:01:19 2012
@@ -663,7 +663,8 @@ svn_client_update4(apr_array_header_t **
iterpool);
if (err)
{
- if (err->apr_err != SVN_ERR_WC_NOT_WORKING_COPY)
+ if ((err->apr_err != SVN_ERR_WC_NOT_WORKING_COPY)
+ && (err->apr_err != SVN_ERR_WC_PATH_NOT_FOUND))
return svn_error_trace(err);
svn_error_clear(err);