Re: Upgrading Squid config file

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.

Easy:

- 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

...later

  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 -=- Ollivier.Robert@eurocontrol.fr