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.)
hope this helps,
Doug
--
This .signature sanitized for your protection
_______________________________________________
freebsd-stable@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-stable
To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"
