Date: Mon, 10 Dec 2012 15:58:50 -0800 From: =?iso-8859-1?Q?Ask_Bj=F8rn_Hansen?= <ask@develooper.com> To: freebsd-stable@freebsd.org Subject: freebsd-update mergemaster options Message-ID: <612DB7D4-07CA-4C48-98F8-081C33E85812@develooper.com>
next in thread | raw e-mail | index | archive | help
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 $ =3D=3D=3D=3D=3D=3D=3D # $FreeBSD: src/etc/auth.conf,v 1.6.32.1.8.1 2012/03/03 06:15:13 = kensmith Exp $ >>>>>>> 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=3D'yes' # Automatically upgrade files that have not been edited AUTO_UPGRADE=3D'yes' # Ignore files that I don't want changed IGNORE_FILES=3D'/etc/motd' # Do not display changes that only affect whitespace DIFF_FLAG=3D"'.Bub'" # Ignore CVS id lines to stop replacing files where only that line has = changed DIFF_OPTIONS=3D'-I$FreeBSD:.*[$]'=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?612DB7D4-07CA-4C48-98F8-081C33E85812>