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

[rh...@apache.org]

Author: rhuijben
Date: Sun Jul 24 17:25:40 2011
New Revision: 1150439

URL: http://svn.apache.org/viewvc?rev=1150439&view=rev
Log:
* subversion/svn/resolve-cmd.c
  (svn_cl__resolve): Make svn return an error exit code when resolving
    conflicts on one or more nodes fails.

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=1150439&r1=1150438&r2=1150439&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/resolve-cmd.c (original)
+++ subversion/trunk/subversion/svn/resolve-cmd.c Sun Jul 24 17:25:40 2011
@@ -54,6 +54,7 @@ svn_cl__resolve(apr_getopt_t *os,
   apr_array_header_t *targets;
   int i;
   apr_pool_t *iterpool;
+  svn_boolean_t had_error = FALSE;
 
   switch (opt_state->accept_which)
     {
@@ -111,9 +112,15 @@ svn_cl__resolve(apr_getopt_t *os,
         {
           svn_handle_warning2(stderr, err, "svn: ");
           svn_error_clear(err);
+          had_error = TRUE;
         }
     }
   svn_pool_destroy(iterpool);
 
+  if (had_error)
+    return svn_error_create(SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS, NULL,
+                            _("Failure occurred resolving one or more "
+                              "conflicts"));
+
   return SVN_NO_ERROR;
 }