subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1780054 - /subversion/trunk/subversion/svn/resolve-cmd.c
Date Tue, 24 Jan 2017 10:40:46 GMT
Author: stsp
Date: Tue Jan 24 10:40:45 2017
New Revision: 1780054

URL: http://svn.apache.org/viewvc?rev=1780054&view=rev
Log:
Make the 'quit' command at the svn resolve conflict prompt work again.
It was broken in r1779687.

* subversion/svn/resolve-cmd.c
  (conflict_walker): If the user wants to quit, cancel the status walk by
   returning SVN_ERR_CANCELLED.
  (svn_cl__walk_conflicts): Handle SVN_ERR_CANCELLED.

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=1780054&r1=1780053&r2=1780054&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/resolve-cmd.c (original)
+++ subversion/trunk/subversion/svn/resolve-cmd.c Tue Jan 24 10:40:45 2017
@@ -65,6 +65,9 @@ conflict_walker(void *baton, svn_client_
                                    cwb->path_prefix, cwb->pb,
                                    cwb->conflict_stats,
                                    cwb->ctx, scratch_pool));
+  if (cwb->quit)
+    return svn_error_create(SVN_ERR_CANCELLED, NULL, NULL);
+
   return SVN_NO_ERROR;
 }
 
@@ -137,6 +140,11 @@ svn_cl__walk_conflicts(apr_array_header_
               svn_error_clear(err);
               continue;
             }
+          else if (root->apr_err == SVN_ERR_CANCELLED)
+            {
+              svn_error_clear(err);
+              break;
+            }
 
           svn_handle_warning2(stderr, svn_error_root_cause(err), "svn: ");
           svn_error_clear(err);



Mime
View raw message