svn commit: r1382776 - in /subversion/trunk/subversion/svnversion: main.c svnversion.1

[cm...@apache.org]

Author: cmpilato
Date: Mon Sep 10 11:57:03 2012
New Revision: 1382776

URL: http://svn.apache.org/viewvc?rev=1382776&view=rev
Log:
For issue #4226 ("svnversion output not always a number")...

* subversion/svnversion/main.c
  (help): Refer to "version identifier" rather than "version number",
    since what is printed is often not merely numeric.

* subversion/svnversion/svnversion.1
  Also here.

Reported by: chealer{__AT__}tigris.org

Modified:
    subversion/trunk/subversion/svnversion/main.c
    subversion/trunk/subversion/svnversion/svnversion.1

Modified: subversion/trunk/subversion/svnversion/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnversion/main.c?rev=1382776&r1=1382775&r2=1382776&view=diff
==============================================================================
--- subversion/trunk/subversion/svnversion/main.c (original)
+++ subversion/trunk/subversion/svnversion/main.c Mon Sep 10 11:57:03 2012
@@ -57,19 +57,19 @@ help(const apr_getopt_option_t *options,
     (svn_cmdline_fprintf
      (stdout, pool,
       _("usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n\n"
-        "  Produce a compact 'version number' for the working copy path\n"
+        "  Produce a compact version identifier for the working copy path\n"
         "  WC_PATH.  TRAIL_URL is the trailing portion of the URL used to\n"
         "  determine if WC_PATH itself is switched (detection of switches\n"
-        "  within WC_PATH does not rely on TRAIL_URL).  The version number\n"
+        "  within WC_PATH does not rely on TRAIL_URL).  The version identifier\n"
         "  is written to standard output.  For example:\n"
         "\n"
         "    $ svnversion . /repos/svn/trunk\n"
         "    4168\n"
         "\n"
-        "  The version number will be a single number if the working\n"
+        "  The version identifier will be a single number if the working\n"
         "  copy is single revision, unmodified, not switched and with\n"
         "  a URL that matches the TRAIL_URL argument.  If the working\n"
-        "  copy is unusual the version number will be more complex:\n"
+        "  copy is unusual the version identifier will be more complex:\n"
         "\n"
         "   4123:4168     mixed revision working copy\n"
         "   4168M         modified working copy\n"

Modified: subversion/trunk/subversion/svnversion/svnversion.1
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnversion/svnversion.1?rev=1382776&r1=1382775&r2=1382776&view=diff
==============================================================================
--- subversion/trunk/subversion/svnversion/svnversion.1 (original)
+++ subversion/trunk/subversion/svnversion/svnversion.1 Mon Sep 10 11:57:03 2012
@@ -23,7 +23,7 @@
 .\"
 .TH svnversion 1
 .SH NAME
-svnversion \- Produce a compact version number for a working copy.
+svnversion \- Produce a compact version identifier for a working copy.
 .SH SYNOPSIS
 .TP
 \fBsvnversion\fP [\fIoptions\fP] [\fIwc_path\fP [\fItrail_url\fP]]