info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: using files with .xls and .doc in CVS


From: David Martin
Subject: Re: using files with .xls and .doc in CVS
Date: Thu, 14 Feb 2002 23:53:36 -0600

Eric,

> I floated a suggestion a while back that -kb should be a bit
> stickier; basically, it should "trump" sources of -k options that
> would otherwise be higher priority.  The idea seemed to meet with
> general (though not universal) approval, if I recall, but
> nobody's written the code.  Neither have I, of course, so this
> isn't a gripe, just an observation -- and perhaps a gentle nudge,
> should the idea happen to appeal to you :-)

Yep - you might be referring to the thread "Proposal to fix CVS
binary file implementation" from December, 2000.  I included
somewhere in that flame war a patch which I've used to make -kb
sticky, even in the presence of -kk on checkout or update.

A link to the archived email that includes the patch is:
http://mail.gnu.org/pipermail/info-cvs/2000-December/011718.html
but I noticed that every instance of "=" got transformed to "=3D", so
here's a cut-and-paste of the correct patch:

*** cvs-1.11/vers_ts.c Thu Dec 21 18:46:35 2000
--- vers_ts.c Fri Dec 22 12:00:45 2000
***************
*** 108,115 ****
--- 108,130 ----
       * -k options specified on the command line override (and overwrite)
       * options stored in the entries file
       */
+ /* DLM start:  Patch to disallow override of -kb from archive
specification */
      if (options && *options != '\0')
+     {
   vers_ts->options = xstrdup (options);
+  if (finfo->rcs != NULL)
+  {
+      char *rcsexpand = RCS_getexpand (finfo->rcs);
+      if ((rcsexpand != NULL) && (rcsexpand[0]=='b'))
+      {
+   if (vers_ts->options != NULL)
+       free (vers_ts->options);
+   vers_ts->options = xmalloc (strlen (rcsexpand) + 3);
+   strcpy (vers_ts->options, "-kb");
+      }
+  }
+     }
+ /* DLM end:  Patch to disallow override of -kb from archive specification
*/
      else if (!vers_ts->options || *vers_ts->options == '\0')
      {
   if (finfo->rcs != NULL)







reply via email to

[Prev in Thread] Current Thread [Next in Thread]