Re: Upgrading Squid config file

From: Ollivier Robert <>
Date: Thu, 31 Oct 1996 15:16:44 +0100

According to Jan-Hinrich Fessel:
> default config file. I am still to figure out how to do an rcsmerge
> operation on squid.conf using changes from squid.conf.default.


- always use "import" to put the default file in your CVS tree

  cvs import conf/squid NLANR SQUID_1_1B8
  [...merge into vendor branch...]
  cvs update -j SQUID_1_1B8


  cvs import conf/squid NLANR SQUID_1_1B9
  [...merge into vendor branch...]
  cvs update -j SQUID_1_1B9

and so on.

This is equivalent to do a diff3 manually except it is all automatic...

Ollivier ROBERT -=- Eurocontrol EEC/TS -=-
Received on Thu Oct 31 1996 - 07:17:13 MST

This archive was generated by hypermail pre-2.1.9 : Tue Dec 09 2003 - 16:33:24 MST