subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject svn commit: r1757756 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date Thu, 25 Aug 2016 21:45:22 GMT
Author: ivan
Date: Thu Aug 25 21:45:22 2016
New Revision: 1757756

URL: http://svn.apache.org/viewvc?rev=1757756&view=rev
Log:
Use SVN_ERR_CEASE_INVOCATION error code instead of SVN_ERR_CANCELLED to
to abort fetching log when gathering additional details of tree conflict.

* subversion/libsvn_client/conflicts.c
  (find_deleted_rev): Raise SVN_ERR_CEASE_INVOCATION instead of
   SVN_ERR_CANCELLED.
  (find_revision_for_suspected_deletion): Check for SVN_ERR_CEASE_INVOCATION
   instead of SVN_ERR_CANCELLED.

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=1757756&r1=1757755&r2=1757756&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Thu Aug 25 21:45:22 2016
@@ -565,7 +565,7 @@ find_yca(svn_client__pathrev_t **yca_loc
  * Find the revision in which a node, optionally ancestrally related to the
  * node specified via find_deleted_rev_baton, was deleted, When the revision
  * was found, store it in BATON->DELETED_REV and abort the log operation
- * by raising SVN_ERR_CANCELLED.
+ * by raising SVN_ERR_CEASE_INVOCATION.
  *
  * If no such revision can be found, leave BATON->DELETED_REV and
  * BATON->REPLACING_NODE_KIND alone.
@@ -718,7 +718,7 @@ find_deleted_rev(void *baton,
   if (deleted_node_found)
     {
       /* We're done. Abort the log operation. */
-      return svn_error_create(SVN_ERR_CANCELLED, NULL, NULL);
+      return svn_error_create(SVN_ERR_CEASE_INVOCATION, NULL, NULL);
     }
 
   return SVN_NO_ERROR;
@@ -1228,7 +1228,7 @@ find_revision_for_suspected_deletion(svn
                         scratch_pool);
   if (err)
     {
-      if (err->apr_err == SVN_ERR_CANCELLED &&
+      if (err->apr_err == SVN_ERR_CEASE_INVOCATION &&
           b.deleted_rev != SVN_INVALID_REVNUM)
 
         {



Mime
View raw message