subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1636595 - /subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
Date Tue, 04 Nov 2014 14:50:48 GMT
Author: julianfoad
Date: Tue Nov  4 14:50:48 2014
New Revision: 1636595

URL: http://svn.apache.org/r1636595
Log:
On the 'move-tracking-2' branch: Tweak error message formatting.

* subversion/svnmover/svnmover.c
  (branch_merge_subtree_r,
   sub_main): Start error messages with a capital letter and don't end
    them with a newline.

Modified:
    subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c

Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c?rev=1636595&r1=1636594&r2=1636595&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Tue Nov  4 14:50:48
2014
@@ -640,7 +640,7 @@ branch_merge_subtree_r(svn_editor3_t *ed
   if (had_conflict)
     {
       return svn_error_createf(SVN_ERR_BRANCHING, NULL,
-                               _("merge failed: conflict(s) occurred"));
+                               _("Merge failed: conflict(s) occurred"));
     }
   else
     {
@@ -1425,7 +1425,7 @@ sub_main(int *exit_code, int argc, const
           SVN_ERR(svn_utf_cstring_to_utf8(&root_url, arg, pool));
           if (! svn_path_is_url(root_url))
             return svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
-                                     "'%s' is not a URL\n", root_url);
+                                     "'%s' is not a URL", root_url);
           root_url = sanitize_url(root_url, pool);
           anchor = root_url;
           break;
@@ -1616,7 +1616,7 @@ sub_main(int *exit_code, int argc, const
         }
       else
         return svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
-                                 "'%s' is not an action\n",
+                                 "'%s' is not an action",
                                  action_string);
 
       /* How many URLs does this action expect? */
@@ -1658,7 +1658,7 @@ sub_main(int *exit_code, int argc, const
               if (! root_url)
                 return svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
                                          "'%s' is not a URL, and "
-                                         "--root-url (-U) not provided\n",
+                                         "--root-url (-U) not provided",
                                          path);
               url = svn_path_url_add_component2(root_url, path, pool);
             }



Mime
View raw message