On Mon, Dec 27, 2010 at 04:52:03PM -0800, Doug Barton thus spake:
On 12/27/2010 16:40, Damien Fleuriot wrote:
On 12/27/10 11:58 PM, Clifton Royston wrote:
OK, and oh well... I wish there were some way to automate the diffing
out of the $FreeBSD lines. I suppose those might be the artifact of
some previous upgrade, so that the file version present is not the one
expected for FreeBSD 6.1.
-- Clifton
Wait, do you mean like, mergemaster -F ?
Excerpt from the manual:
-F If the files differ only by VCS Id ($FreeBSD) install
the new file.
I've discovered this rather recently, it's a *lifesaver*
This comes from fbsd7's version though, I can not say for the one you're
still running on fbsd6
You always want to run mergemaster from the version you are upgrading
_to_. It doesn't happen often (by design) but occasionally mergemaster
has to grow "special knowledge" of specific files/directories/etc. in a
new FreeBSD version.
As far as I can tell, freebsd-update doesn't use mergemaster.
/usr/src/usr.sbin/freebsd-update/freebsd-update.sh
Source installation does, however I don't believe a binary upgrade does.
-jgh
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-stable
To unsubscribe, send any mail to "[email protected]"
