Upgrade from 7.1-RELEASE to 7.2-RELEASE through freebsd update

[Ruben de Groot]

On Thu, Jun 18, 2009 at 10:34:54AM +0200, Erwan David typed:
> 	I tried to upgrade my 7.1-RELEASE into 7.2-RELEASE. However
> freebsd-update kept asking me to merge every file in /etc whose $Id$
> line changed (that makes about all files).
> 
> Is there a way, as with mergemaster, to make it not consider the $Id$
> line for the manual merge ?

You could let freebsd-update ignore /etc (but not /usr/src) and use
mergemaster for your configuration files.


Ruben