subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1751896 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date Fri, 08 Jul 2016 12:40:28 GMT
Author: stsp
Date: Fri Jul  8 12:40:27 2016
New Revision: 1751896

URL: http://svn.apache.org/viewvc?rev=1751896&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (resolve_incoming_delete_accept): Ignore 'WC_PATH_NOT_FOUND' error from
   svn_wc_delete(). We want the path deleted and gone, so if it's not a
   versioned item then that's just fine.
   Makes the 'accept incoming deletion' option work for conflict vitims
   with an incoming delete which are already missing from the WC (such
   that 'svn status' shows '!' for them).

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

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1751896&r1=1751895&r2=1751896&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Fri Jul  8 12:40:27 2016
@@ -6257,7 +6257,19 @@ resolve_incoming_delete_accept(svn_clien
                        ctx->notify_func2, ctx->notify_baton2,
                        scratch_pool);
   if (err)
-    goto unlock_wc;
+    {
+      if (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
+        {
+          /* Not a versioned path. This can happen if the victim has already
+           * been deleted in our branche's history, for example. Either way,
+           * the item is gone, which is what we want, so don't treat this as
+           * a fatal error. */
+          svn_error_clear(err);
+          err = SVN_NO_ERROR;
+        }
+      else
+        goto unlock_wc;
+    }
 
   if (ctx->notify_func2)
     ctx->notify_func2(ctx->notify_baton2,



Mime
View raw message