[Checked in 1999-04-13 (along with a sanity.sh test case).

-kingdon]

Content-Type: multipart/mixed; boundary="explosion-Ft__Bragg-_400_million_in_gold_bullion-96pEpLG73/"
From: Noah Friedman <friedman@splode.com>
To: bug-cvs@gnu.org
Subject: [patch] cvs 1.10 `diff --ifdef' "can't parse date/time" pserver error
Date: Fri, 26 Feb 1999 16:09:15 -0800 (PST)


--explosion-Ft__Bragg-_400_million_in_gold_bullion-96pEpLG73/
Content-Type: text/plain; charset=us-ascii
Content-Description: message body text
Content-Transfer-Encoding: 7bit

If you try to do a "diff --ifdef" using a pserver connection to a cvs 1.10
server (or any previous server version, but they don't support ifdef anyway
so far as I know), you get that error.

The client sends "-D" for the diff arg and the server is misinterpreting
this as a date spec.  It seems like the easiest way to fix this is to send
"--ifdef" instead.  There should be no compatibility issues since prior
released versions of CVS did not support this feature anyway, and this
change applied to a client then works fine with unpatched CVS 1.10 servers.

Obviously, I'm submitting this one-line change under the GPL.  :-)


--explosion-Ft__Bragg-_400_million_in_gold_bullion-96pEpLG73/
Content-Type: text/plain
Content-Disposition: inline;
	filename="cvs.diff"
Content-Transfer-Encoding: 7bit

Index: ChangeLog
===================================================================
RCS file: /m/src/is/tools/cvs/src/ChangeLog,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.3.2.1
diff -b -u -r1.1.1.3 -r1.1.1.3.2.1
--- ChangeLog	1998/09/05 00:22:30	1.1.1.3
+++ ChangeLog	1999/02/27 00:02:18	1.1.1.3.2.1
@@ -1,3 +1,8 @@
+Fri Feb 26 16:00:35 1999  Noah Friedman  <friedman@splode.com>
+
+	* diff.c (diff): Put "--ifdef=" in opts string, not "-D"; the
+	latter is confused by pserver for a date spec.
+
 Thu Aug 13 11:15:24 1998  Noel Cragg  <noel@swish.red-bean.com>
 
 	* version.c: Change version number to 1.10 and name to `Halibut'.
Index: diff.c
===================================================================
RCS file: /m/src/is/tools/cvs/src/diff.c,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.3.2.1
diff -b -u -r1.1.1.3 -r1.1.1.3.2.1
--- diff.c	1998/09/05 00:22:32	1.1.1.3
+++ diff.c	1999/02/27 00:02:19	1.1.1.3.2.1
@@ -267,7 +267,7 @@
 		break;
 	    case 131:
 		/* --ifdef.  */
-		strcat_and_allocate (&opts, &opts_allocated, " -D");
+		strcat_and_allocate (&opts, &opts_allocated, " --ifdef=");
 		strcat_and_allocate (&opts, &opts_allocated, optarg);
 		break;
 	    case 129: case 130:           case 132: case 133: case 134:

--explosion-Ft__Bragg-_400_million_in_gold_bullion-96pEpLG73/--