On 12/11/2012 12:58 AM, Ask Bjørn Hansen wrote:
Hi,
On an 8.2 box, I run
freebsd-update -r 8.3-RELEASE upgrade
I am getting hundreds of files with "conflicts" like:
<<<<<<< current version
# $FreeBSD: src/etc/auth.conf,v 1.6.32.1.4.1 2010/06/14 02:09:06 kensmith Exp $
=======
# $FreeBSD: src/etc/auth.conf,v 1.6.32.1.8.1 2012/03/03 06:15:13 kensmith Exp $
I don't know why this happens. Upgrading a couple of boxes from 8.1-RELEASE
to 8.3-RELEASE did not give me these conflicts.
As far as I know freebsd-update does not use mergemaster.rc, just
freebsd-update.conf
It might be the case that you have upgraded from source before on this
machine that causes this situation?
8.3-RELEASE
... which is just tremendously unhelpful. I'm using the default freebsd-update
configuration. Per an old mail from the archives I made sure I have
/etc/mergemaster.rc setup as below, but it doesn't seem to make a difference.
Any ideas? In the past I've just given up on using freebsd-update and gone
back to manually compiling and installing world, but for this box I'd really
like not to.
Ask
$ cat /etc/mergemaster.rc
# Automatically install files that do not exist
AUTO_INSTALL='yes'
# Automatically upgrade files that have not been edited
AUTO_UPGRADE='yes'
# Ignore files that I don't want changed
IGNORE_FILES='/etc/motd'
# Do not display changes that only affect whitespace
DIFF_FLAG="'.Bub'"
# Ignore CVS id lines to stop replacing files where only that line has changed
DIFF_OPTIONS='-I$FreeBSD:.*[$]'
_______________________________________________
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"
