*** 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)