subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1140215 - /subversion/trunk/subversion/libsvn_client/cmdline.c
Date Mon, 27 Jun 2011 15:52:36 GMT
Author: julianfoad
Date: Mon Jun 27 15:52:36 2011
New Revision: 1140215

URL: http://svn.apache.org/viewvc?rev=1140215&view=rev
Log:
* subversion/libsvn_client/cmdline.c
  (svn_client_args_to_target_array2): Restore documented error behaviour. A
    follow-up to r1101990.

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

Modified: subversion/trunk/subversion/libsvn_client/cmdline.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/cmdline.c?rev=1140215&r1=1140214&r2=1140215&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/cmdline.c (original)
+++ subversion/trunk/subversion/libsvn_client/cmdline.c Mon Jun 27 15:52:36 2011
@@ -347,20 +347,10 @@ svn_client_args_to_target_array2(apr_arr
         {
           err = svn_client_root_url_from_path(&root_url, "", ctx, pool);
           if (err || root_url == NULL)
-            {
-              if (reserved_names)
-                for (i = 0; i < reserved_names->nelts; ++i)
-                  err = svn_error_createf(SVN_ERR_RESERVED_FILENAME_SPECIFIED,
-                                          err,
-                                          _("'%s' ends in a reserved name"),
-                                          APR_ARRAY_IDX(reserved_names, i,
-                                                        const char *));
-
-              return svn_error_create(SVN_ERR_WC_NOT_WORKING_COPY, err,
-                                      _("Resolving '^/': no repository root "
-                                        "found in the target arguments or "
-                                        "in the current directory"));
-            }
+            return svn_error_create(SVN_ERR_WC_NOT_WORKING_COPY, err,
+                                    _("Resolving '^/': no repository root "
+                                      "found in the target arguments or "
+                                      "in the current directory"));
         }
 
       *targets_p = apr_array_make(pool, output_targets->nelts,
@@ -395,7 +385,7 @@ svn_client_args_to_target_array2(apr_arr
   else
     *targets_p = output_targets;
 
-  if (reserved_names)
+  if (reserved_names && ! err)
     for (i = 0; i < reserved_names->nelts; ++i)
       err = svn_error_createf(SVN_ERR_RESERVED_FILENAME_SPECIFIED, err,
                               _("'%s' ends in a reserved name"),



Mime
View raw message