subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1826352 [2/2] - in /subversion/trunk: subversion/svn/ subversion/svnadmin/ subversion/svnbench/ subversion/svnfsfs/ subversion/svnlook/ subversion/svnrdump/ subversion/svnsync/ tools/client-side/svn-mergeinfo-normalizer/ tools/client-side/...
Date Fri, 09 Mar 2018 14:24:47 GMT
Modified: subversion/trunk/subversion/svnlook/svnlook.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnlook/svnlook.c?rev=1826352&r1=1826351&r2=1826352&view=diff
==============================================================================
--- subversion/trunk/subversion/svnlook/svnlook.c (original)
+++ subversion/trunk/subversion/svnlook/svnlook.c Fri Mar  9 14:24:47 2018
@@ -216,35 +216,35 @@ static const svn_opt_subcommand_desc3_t
 {
   {"author", subcommand_author, {0}, {N_(
       "usage: svnlook author REPOS_PATH\n"
-      "\n"
+      "\n"), N_(
       "Print the author.\n"
    )},
    {'r', 't'} },
 
   {"cat", subcommand_cat, {0}, {N_(
       "usage: svnlook cat REPOS_PATH FILE_PATH\n"
-      "\n"
+      "\n"), N_(
       "Print the contents of a file.  Leading '/' on FILE_PATH is optional.\n"
    )},
    {'r', 't'} },
 
   {"changed", subcommand_changed, {0}, {N_(
       "usage: svnlook changed REPOS_PATH\n"
-      "\n"
+      "\n"), N_(
       "Print the paths that were changed.\n"
    )},
    {'r', 't', svnlook__copy_info} },
 
   {"date", subcommand_date, {0}, {N_(
       "usage: svnlook date REPOS_PATH\n"
-      "\n"
+      "\n"), N_(
       "Print the datestamp.\n"
    )},
    {'r', 't'} },
 
   {"diff", subcommand_diff, {0}, {N_(
       "usage: svnlook diff REPOS_PATH\n"
-      "\n"
+      "\n"), N_(
       "Print GNU-style diffs of changed files and properties.\n"
    )},
    {'r', 't', svnlook__no_diff_deleted, svnlook__no_diff_added,
@@ -253,7 +253,7 @@ static const svn_opt_subcommand_desc3_t
 
   {"dirs-changed", subcommand_dirschanged, {0}, {N_(
       "usage: svnlook dirs-changed REPOS_PATH\n"
-      "\n"
+      "\n"), N_(
       "Print the directories that were themselves changed (property edits)\n"
       "or whose file children were changed.\n"
    )},
@@ -261,7 +261,7 @@ static const svn_opt_subcommand_desc3_t
 
   {"filesize", subcommand_filesize, {0}, {N_(
       "usage: svnlook filesize REPOS_PATH PATH_IN_REPOS\n"
-      "\n"
+      "\n"), N_(
       "Print the size (in bytes) of the file located at PATH_IN_REPOS as\n"
       "it is represented in the repository.\n"
    )},
@@ -269,14 +269,14 @@ static const svn_opt_subcommand_desc3_t
 
   {"help", subcommand_help, {"?", "h"}, {N_(
       "usage: svnlook help [SUBCOMMAND...]\n"
-      "\n"
+      "\n"), N_(
       "Describe the usage of this program or its subcommands.\n"
    )},
    {0} },
 
   {"history", subcommand_history, {0}, {N_(
       "usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
-      "\n"
+      "\n"), N_(
       "Print information about the history of a path in the repository (or\n"
       "the root directory if no path is supplied).\n"
    )},
@@ -284,21 +284,21 @@ static const svn_opt_subcommand_desc3_t
 
   {"info", subcommand_info, {0}, {N_(
       "usage: svnlook info REPOS_PATH\n"
-      "\n"
+      "\n"), N_(
       "Print the author, datestamp, log message size, and log message.\n"
    )},
    {'r', 't'} },
 
   {"lock", subcommand_lock, {0}, {N_(
       "usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
-      "\n"
+      "\n"), N_(
       "If a lock exists on a path in the repository, describe it.\n"
    )},
    {0} },
 
   {"log", subcommand_log, {0}, {N_(
       "usage: svnlook log REPOS_PATH\n"
-      "\n"
+      "\n"), N_(
       "Print the log message.\n"
    )},
    {'r', 't'} },
@@ -308,7 +308,7 @@ static const svn_opt_subcommand_desc3_t
       "                    "
       /* The line above is actually needed, so do NOT delete it! */
       "       2. svnlook propget --revprop REPOS_PATH PROPNAME\n"
-      "\n"
+      "\n"), N_(
       "Print the raw value of a property on a path in the repository.\n"
       "With --revprop, print the raw value of a revision property.\n"
    )},
@@ -319,7 +319,7 @@ static const svn_opt_subcommand_desc3_t
       "                      "
       /* The line above is actually needed, so do NOT delete it! */
       "       2. svnlook proplist --revprop REPOS_PATH\n"
-      "\n"
+      "\n"), N_(
       "List the properties of a path in the repository, or\n"
       "with the --revprop option, revision properties.\n"
       "With -v, show the property values too.\n"
@@ -329,7 +329,7 @@ static const svn_opt_subcommand_desc3_t
 
   {"tree", subcommand_tree, {0}, {N_(
       "usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
-      "\n"
+      "\n"), N_(
       "Print the tree, starting at PATH_IN_REPOS (if supplied, at the root\n"
       "of the tree otherwise), optionally showing node revision ids.\n"
    )},
@@ -337,14 +337,14 @@ static const svn_opt_subcommand_desc3_t
 
   {"uuid", subcommand_uuid, {0}, {N_(
       "usage: svnlook uuid REPOS_PATH\n"
-      "\n"
+      "\n"), N_(
       "Print the repository's UUID.\n"
    )},
    {0} },
 
   {"youngest", subcommand_youngest, {0}, {N_(
       "usage: svnlook youngest REPOS_PATH\n"
-      "\n"
+      "\n"), N_(
       "Print the youngest revision number.\n"
    )},
    {svnlook__no_newline} },

Modified: subversion/trunk/subversion/svnrdump/svnrdump.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/svnrdump.c?rev=1826352&r1=1826351&r2=1826352&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/svnrdump.c (original)
+++ subversion/trunk/subversion/svnrdump/svnrdump.c Fri Mar  9 14:24:47 2018
@@ -85,7 +85,7 @@ static const svn_opt_subcommand_desc3_t
 {
   { "dump", dump_cmd, { 0 }, {N_(
        "usage: svnrdump dump URL [-r LOWER[:UPPER]]\n"
-       "\n"
+       "\n"), N_(
        "Dump revisions LOWER to UPPER of repository at remote URL to stdout\n"
        "in a 'dumpfile' portable format.  If only LOWER is given, dump that\n"
        "one revision.\n"
@@ -93,13 +93,13 @@ static const svn_opt_subcommand_desc3_t
     { 'r', 'q', opt_incremental, SVN_SVNRDUMP__BASE_OPTIONS } },
   { "load", load_cmd, { 0 }, {N_(
        "usage: svnrdump load URL\n"
-       "\n"
+       "\n"), N_(
        "Load a 'dumpfile' given on stdin to a repository at remote URL.\n"
     )},
     { 'q', opt_skip_revprop, SVN_SVNRDUMP__BASE_OPTIONS } },
   { "help", 0, { "?", "h" }, {N_(
        "usage: svnrdump help [SUBCOMMAND...]\n"
-       "\n"
+       "\n"), N_(
        "Describe the usage of this program or its subcommands.\n"
     )},
     { 0 } },

Modified: subversion/trunk/subversion/svnsync/svnsync.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnsync/svnsync.c?rev=1826352&r1=1826351&r2=1826352&view=diff
==============================================================================
--- subversion/trunk/subversion/svnsync/svnsync.c (original)
+++ subversion/trunk/subversion/svnsync/svnsync.c Fri Mar  9 14:24:47 2018
@@ -93,13 +93,13 @@ static const svn_opt_subcommand_desc3_t
   {
     { "initialize", initialize_cmd, { "init" }, {N_(
          "usage: svnsync initialize DEST_URL SOURCE_URL\n"
-         "\n"
+         "\n"), N_(
          "Initialize a destination repository for synchronization from\n"
          "another repository.\n"
-         "\n"
+         "\n"), N_(
          "If the source URL is not the root of a repository, only the\n"
          "specified part of the repository will be synchronized.\n"
-         "\n"
+         "\n"), N_(
          "The destination URL must point to the root of a repository which\n"
          "has been configured to allow revision property changes.  In\n"
          "the general case, the destination repository must contain no\n"
@@ -109,7 +109,7 @@ static const svn_opt_subcommand_desc3_t
          "their counterparts in the source repository.  (This is useful\n"
          "when initializing a copy of a repository as a mirror of that same\n"
          "repository, for example.)\n"
-         "\n"
+         "\n"), N_(
          "You should not commit to, or make revision property changes in,\n"
          "the destination repository by any method other than 'svnsync'.\n"
          "In other words, the destination repository should be a read-only\n"
@@ -120,10 +120,10 @@ static const svn_opt_subcommand_desc3_t
         svnsync_opt_steal_lock, 'M' } },
     { "synchronize", synchronize_cmd, { "sync" }, {N_(
          "usage: svnsync synchronize DEST_URL [SOURCE_URL]\n"
-         "\n"
+         "\n"), N_(
          "Transfer all pending revisions to the destination from the source\n"
          "with which it was initialized.\n"
-         "\n"
+         "\n"), N_(
          "If SOURCE_URL is provided, use that as the source repository URL,\n"
          "ignoring what is recorded in the destination repository as the\n"
          "source URL.  Specifying SOURCE_URL is recommended in particular\n"
@@ -134,26 +134,26 @@ static const svn_opt_subcommand_desc3_t
         svnsync_opt_disable_locking, svnsync_opt_steal_lock, 'M' } },
     { "copy-revprops", copy_revprops_cmd, { 0 }, {N_(
          "usage:\n"
-         "\n"
+         "\n"), N_(
          "    1. svnsync copy-revprops DEST_URL [SOURCE_URL]\n"
          "    2. svnsync copy-revprops DEST_URL REV[:REV2]\n"
-         "\n"
+         "\n"), N_(
          "Copy the revision properties in a given range of revisions to the\n"
          "destination from the source with which it was initialized.  If the\n"
          "revision range is not specified, it defaults to all revisions in\n"
          "the DEST_URL repository.  Note also that the 'HEAD' revision is the\n"
          "latest in DEST_URL, not necessarily the latest in SOURCE_URL.\n"
-         "\n"
+         "\n"), N_(
          "If SOURCE_URL is provided, use that as the source repository URL,\n"
          "ignoring what is recorded in the destination repository as the\n"
          "source URL.  Specifying SOURCE_URL is recommended in particular\n"
          "if untrusted users/administrators may have write access to the\n"
          "DEST_URL repository.\n"
-         "\n"
+         "\n"), N_(
          "Unless you need to trigger the destination repositoy's revprop\n"
          "change hooks for all revision properties, it is recommended to use\n"
          "the --skip-unchanged option for best performance.\n"
-         "\n"
+         "\n"), N_(
          "Form 2 is deprecated syntax, equivalent to specifying \"-rREV[:REV2]\".\n"
       )},
       { SVNSYNC_OPTS_DEFAULT, svnsync_opt_source_prop_encoding, 'q', 'r',
@@ -161,14 +161,14 @@ static const svn_opt_subcommand_desc3_t
         svnsync_opt_skip_unchanged, 'M' } },
     { "info", info_cmd, { 0 }, {N_(
          "usage: svnsync info DEST_URL\n"
-         "\n"
+         "\n"), N_(
          "Print information about the synchronization destination repository\n"
          "located at DEST_URL.\n"
       )},
       { SVNSYNC_OPTS_DEFAULT } },
     { "help", help_cmd, { "?", "h" }, {N_(
          "usage: svnsync help [SUBCOMMAND...]\n"
-         "\n"
+         "\n"), N_(
          "Describe the usage of this program or its subcommands.\n"
       )},
       { 0 } },

Modified: subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c?rev=1826352&r1=1826351&r2=1826352&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
(original)
+++ subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
Fri Mar  9 14:24:47 2018
@@ -235,14 +235,14 @@ const svn_opt_subcommand_desc3_t svn_min
      "Generate a report of which part of the sub-tree mergeinfo can be\n"
      "removed and which part can't.\n"
      "usage: analyze [WCPATH...]\n"
-     "\n"
+     "\n"), N_(
      "  If neither --remove-obsoletes, --remove-redundant nor --combine-ranges\n"
      "  option is given, all three will be used implicitly.\n"
-     "\n"
+     "\n"), N_(
      "  In verbose mode, the command will behave just like 'normalize --dry-run'\n"
      "  but will show an additional summary of all deleted branches that were\n"
      "  encountered plus the revision of their latest deletion (if available).\n"
-     "\n"
+     "\n"), N_(
      "  In non-verbose mode, the per-node output does not give the parent path,\n"
      "  no successful elisions and branch removals nor the list of remaining\n"
      "  branches.\n"
@@ -254,11 +254,11 @@ const svn_opt_subcommand_desc3_t svn_min
   { "normalize", svn_min__normalize, { 0 }, {N_(
      "Normalize / reduce the mergeinfo throughout the working copy sub-tree.\n"
      "usage: normalize [WCPATH...]\n"
-     "\n"
+     "\n"), N_(
      "  If neither --remove-obsoletes, --remove-redundant, --combine-ranges\n"
      "  nor --remove-redundant-misaligned option is given, --remove-redundant\n"
      "  will be used implicitly.\n"
-     "\n"
+     "\n"), N_(
      "  In non-verbose mode, only general progress as well as a summary before\n"
      "  and after the normalization process will be shown.  Note that sub-node\n"
      "  mergeinfo which could be removed entirely does not contribute to the\n"
@@ -266,12 +266,12 @@ const svn_opt_subcommand_desc3_t svn_min
      "  ranges combined only refers to the mergeinfo lines still present after\n"
      "  the normalization process.  To get total numbers, compare the initial\n"
      "  with the final mergeinfo statistics.\n"
-     "\n"
+     "\n"), N_(
      "  The detailed operation log in verbose mode replaces the progress display.\n"
      "  For each node with mergeinfo, the nearest parent node with mergeinfo is\n"
      "  given - if there is one and the result of trying to remove the mergeinfo\n"
      "  is shown for each branch.  The various outputs are:\n"
-     "\n"
+     "\n"), N_(
      "    elide redundant branch - Revision ranges are the same as in the parent.\n"
      "                             Mergeinfo for this branch can be elided.\n"
      "    elide branch           - Not an exact match with the parent but the\n"
@@ -325,7 +325,7 @@ const svn_opt_subcommand_desc3_t svn_min
      "                             The sub-tree mergeinfo cannot be elided.\n"
      "    REVERSE RANGE(S) found - The mergeinfo contains illegal reverse ranges.\n"
      "                             The sub-tree mergeinfo cannot be elided.\n"
-     "\n"
+     "\n"), N_(
      "  If all branches have been removed from a nodes' mergeinfo, the whole\n"
      "  svn:mergeinfo property will be removed.  Otherwise, only obsolete\n"
      "  branches will be removed.  In verbose mode, a list of branches that\n"
@@ -339,11 +339,11 @@ const svn_opt_subcommand_desc3_t svn_min
      "Read a list of branch names from the given file and remove all\n"
      "mergeinfo referring to these branches from the given targets.\n"
      "usage: remove-branches [WCPATH...] --file FILE\n"
-     "\n"
+     "\n"), N_(
      "  The command will behave just like 'normalize --remove-obsoletes' but\n"
      "  will never actually contact the repository.  Instead, it assumes any\n"
      "  path given in FILE is a deleted branch.\n"
-     "\n"
+     "\n"), N_(
      "  Compared to a simple 'normalize --remove-obsoletes' run, this command\n"
      "  allows for selective removal of obsolete branches.  It may therefore be\n"
      "  better suited for large deployments with complex branch structures.\n"

Modified: subversion/trunk/tools/client-side/svnconflict/svnconflict.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svnconflict/svnconflict.c?rev=1826352&r1=1826351&r2=1826352&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svnconflict/svnconflict.c (original)
+++ subversion/trunk/tools/client-side/svnconflict/svnconflict.c Fri Mar  9 14:24:47 2018
@@ -160,7 +160,7 @@ static const svn_opt_subcommand_desc3_t
   { "list", svnconflict_list, {"ls"}, {N_(
      "List conflicts at a conflicted path.\n"
      "usage: list PATH\n"
-     "\n"
+     "\n"), N_(
      "  List conflicts at PATH, one per line. Possible conflicts are:\n"
      "  \n"
      "  text-conflict\n"
@@ -183,7 +183,7 @@ static const svn_opt_subcommand_desc3_t
   { "options-text", svnconflict_options_text, {0}, {N_(
      "List options for resolving a text conflict at path.\n"
      "usage: options-text PATH\n"
-     "\n"
+     "\n"), N_(
      "  List text conflict resolution options at PATH, one per line.\n"
      "  Each line contains a numeric option ID, a colon, and a description.\n"
      "  If PATH is not in conflict, the exit code will be 1, and 0 otherwise.\n"
@@ -193,7 +193,7 @@ static const svn_opt_subcommand_desc3_t
   { "options-prop", svnconflict_options_prop, {0}, {N_(
      "List options for resolving a property conflict at path.\n"
      "usage: options-prop PATH\n"
-     "\n"
+     "\n"), N_(
      "  List property conflict resolution options at PATH, one per line.\n"
      "  Each line contains a numeric option ID, a colon, and a description.\n"
      "  If PATH is not in conflict, the exit code will be 1, and 0 otherwise.\n"
@@ -203,7 +203,7 @@ static const svn_opt_subcommand_desc3_t
   { "options-tree", svnconflict_options_tree, {0}, {N_(
      "List options for resolving a tree conflict at path.\n"
      "usage: options-tree PATH\n"
-     "\n"
+     "\n"), N_(
      "  List tree conflict resolution options at PATH, one per line.\n"
      "  Each line contains a numeric option ID, a colon, and a description.\n"
      "  If PATH is not in conflict, the exit code will be 1, and 0 otherwise.\n"
@@ -213,7 +213,7 @@ static const svn_opt_subcommand_desc3_t
   { "resolve-text", svnconflict_resolve_text, {0}, {N_(
      "Resolve the text conflict at path.\n"
      "usage: resolve-text OPTION_ID PATH\n"
-     "\n"
+     "\n"), N_(
      "  Resolve the text conflict at PATH with a given resolution option.\n"
      "  If PATH is not in conflict, the exit code will be 1, and 0 otherwise.\n"
     )},
@@ -222,7 +222,7 @@ static const svn_opt_subcommand_desc3_t
   { "resolve-prop", svnconflict_resolve_prop, {0}, {N_(
      "Resolve the property conflict at path.\n"
      "usage: resolve-prop PROPNAME OPTION_ID PATH\n"
-     "\n"
+     "\n"), N_(
      "  Resolve conflicted property PROPNAME at PATH with a given resolution option.\n"
      "  If PATH is not in conflict, the exit code will be 1, and 0 otherwise.\n"
     )},
@@ -231,7 +231,7 @@ static const svn_opt_subcommand_desc3_t
   { "resolve-tree", svnconflict_resolve_tree, {0}, {N_(
      "Resolve the tree conflict at path.\n"
      "usage: resolve-tree OPTION_ID PATH\n"
-     "\n"
+     "\n"), N_(
      "  Resolve the tree conflict at PATH with a given resolution option.\n"
      "  If PATH is not in conflict, the exit code will be 1, and 0 otherwise.\n"
     )},



Mime
View raw message