svn commit: r1127518 - /subversion/trunk/subversion/libsvn_client/update.c

[da...@apache.org]

Author: danielsh
Date: Wed May 25 13:12:06 2011
New Revision: 1127518

URL: http://svn.apache.org/viewvc?rev=1127518&view=rev
Log:
Follow-up to r1127189:

* subversion/libsvn_client/update.c
  (update_internal): Be more specific when ignoring errors.

(Tests pass, but we can extend the list of ignored errors if needed.)

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=1127518&r1=1127517&r2=1127518&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/update.c (original)
+++ subversion/trunk/subversion/libsvn_client/update.c Wed May 25 13:12:06 2011
@@ -237,11 +237,13 @@ update_internal(svn_revnum_t *result_rev
   /* It does not make sense to update tree-conflict victims. */
   err = svn_wc_conflicted_p3(NULL, NULL, &tree_conflicted,
                              ctx->wc_ctx, local_abspath, pool);
-  if (err)
+  if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
     {
       svn_error_clear(err);
       tree_conflicted = FALSE;
     }
+  else
+    SVN_ERR(err);
 
   if (!SVN_IS_VALID_REVNUM(revnum) || tree_conflicted)
     {