[Cvs-cvs] ccvs/src ChangeLog patch.c

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/05/20 12:44:30

Modified files:
        src            : ChangeLog patch.c 

Log message:
        * patch.c (rdiff_usage): Remove obsolete -V argument.
        (main): Remove -V processing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3419&tr2=1.3420&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/patch.c.diff?tr1=1.109&tr2=1.110&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3419 ccvs/src/ChangeLog:1.3420
--- ccvs/src/ChangeLog:1.3419   Sat May 20 12:17:32 2006
+++ ccvs/src/ChangeLog  Sat May 20 12:44:30 2006
@@ -1,5 +1,8 @@
 2006-05-20  Derek Price  <address@hidden>
 
+       * patch.c (rdiff_usage): Remove obsolete -V argument.
+       (main): Remove -V processing.
+
        * patch.c (rdiff_usage): Use {} around required argument.
        * tag.c (rtag_usage): tag/date is not actually a required argument.
 
Index: ccvs/src/patch.c
diff -u ccvs/src/patch.c:1.109 ccvs/src/patch.c:1.110
--- ccvs/src/patch.c:1.109      Sat May 20 12:17:32 2006
+++ ccvs/src/patch.c    Sat May 20 12:44:30 2006
@@ -58,7 +58,7 @@
 
 static const char *const patch_usage[] =
 {
-    "Usage: %s %s [-flR] [-c|-u] [-s|-t] [-V %%d] [-k kopt]\n",
+    "Usage: %s %s [-flR] [-c|-u] [-s|-t] [-k kopt]\n",
     "                 {-r rev | -D date} [-r rev2 | -D date2] modules...\n",
     "\t-f\tForce a head revision match if tag/date not found.\n",
     "\t-l\tLocal directory only, not recursive\n",
@@ -67,7 +67,6 @@
     "\t-u\tUnidiff format.\n",
     "\t-s\tShort patch - one liner per file.\n",
     "\t-t\tTop two diffs - last change made to the file.\n",
-    "\t-V vers\tUse RCS Version \"vers\" for keyword expansion.\n",
     "\t-k kopt\tSpecify keyword expansion mode.\n",
     "\t-D date\tDate.\n",
     "\t-r rev\tRevision - symbolic or numeric.\n",
@@ -141,25 +140,6 @@
                    free (options);
                options = RCS_check_kflag (optarg);
                break;
-           case 'V':
-               /* This option is pretty seriously broken:
-                  1.  It is not clear what it does (does it change keyword
-                  expansion behavior?  If so, how?  Or does it have
-                  something to do with what version of RCS we are using?
-                  Or the format we write RCS files in?).
-                  2.  Because both it and -k use the options variable,
-                  specifying both -V and -k doesn't work.
-                  3.  At least as of CVS 1.9, it doesn't work (failed
-                  assertion in RCS_checkout where it asserts that options
-                  starts with -k).  Few people seem to be complaining.
-                  In the future (perhaps the near future), I have in mind
-                  removing it entirely, and updating NEWS and cvs.texinfo,
-                  but in case it is a good idea to give people more time
-                  to complain if they would miss it, I'll just add this
-                  quick and dirty error message for now.  */
-               error (1, 0,
-                      "the -V option is obsolete and should not be used");
-               break;
            case 'u':
                unidiff = 1;            /* Unidiff */
                break;