svn commit: r1771333 - /subversion/trunk/subversion/svn/resolve-cmd.c

[st...@apache.org]

Author: stsp
Date: Fri Nov 25 15:04:02 2016
New Revision: 1771333

URL: http://svn.apache.org/viewvc?rev=1771333&view=rev
Log:
Ignore 'path not found' errors from the conflict status walk.

* subversion/svn/resolve-cmd.c
  (svn_cl__walk_conflicts): Ignore errors with root cause PATH_NOT_FOUND.
   These may happen legitimately if the working copy is re-arranged by
   the conflict resolver.

Modified:
    subversion/trunk/subversion/svn/resolve-cmd.c

Modified: subversion/trunk/subversion/svn/resolve-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/resolve-cmd.c?rev=1771333&r1=1771332&r2=1771333&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/resolve-cmd.c (original)
+++ subversion/trunk/subversion/svn/resolve-cmd.c Fri Nov 25 15:04:02 2016
@@ -392,6 +392,16 @@ svn_cl__walk_conflicts(apr_array_header_
 
       if (err)
         {
+          svn_error_t *root = svn_error_root_cause(err);
+
+          if (root->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
+            {
+              /* ### Ignore. These errors can happen due to the working copy
+               * ### being re-arranged during tree conflict resolution. */
+              svn_error_clear(err);
+              continue;
+            }
+
           svn_handle_warning2(stderr, svn_error_root_cause(err), "svn: ");
           svn_error_clear(err);
           had_error = TRUE;