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

[Erwan David]

On Fri, Jun 19, 2009 at 08:56:03AM CEST, Doug Barton <dougb at FreeBSD.org> said:
> Ruben de Groot wrote:
> > 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 ?
> 
> Step 1, 'man mergemaster'  :)
> Step 2, pay special attention to the -F option
> Step 3, pay more special attention to the -U option
> 
> But seriously folks, run 'mergemaster -Fi' once, then run
> 'mergemaster -U'. (And seriously read the man page.)

freebsd-update does not use mergemaster, that's a part of the
problem.

-- 
Erwan