svn commit: r1461848 - /subversion/trunk/subversion/libsvn_client/resolved.c

[julianfoad]

Author: julianfoad
Date: Wed Mar 27 21:01:14 2013
New Revision: 1461848

URL: http://svn.apache.org/r1461848
Log:
* subversion/libsvn_client/resolved.c
  (svn_client__resolve_conflicts): Avoid erroring out if the target path
    doesn't exist in the WC, which can happen when resolving a tree
    conflict where the local node is missing.

Found by: stsp

Modified:
    subversion/trunk/subversion/libsvn_client/resolved.c

Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1461848&r1=1461847&r2=1461848&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Wed Mar 27 21:01:14 
2013
@@ -81,11 +81,21 @@ svn_client__resolve_conflicts(svn_boolea
 
       if (conflicts_remain)
         {
+          svn_error_t *err;
           svn_boolean_t text_c, prop_c, tree_c;
 
-          SVN_ERR(svn_wc_conflicted_p3(&text_c, &prop_c, &tree_c,
-                                       ctx->wc_ctx, local_abspath,
-                                       iterpool));
+          err = svn_wc_conflicted_p3(&text_c, &prop_c, &tree_c,
+                                     ctx->wc_ctx, local_abspath,
+                                     iterpool);
+          if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
+            {
+              svn_error_clear(err);
+              text_c = prop_c = tree_c = FALSE;
+            }
+          else
+            {
+              SVN_ERR(err);
+            }
           if (text_c || prop_c || tree_c)
             *conflicts_remain = TRUE;
         }