From owner-freebsd-stable@FreeBSD.ORG Tue Dec 11 00:16:11 2012 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B6796633 for ; Tue, 11 Dec 2012 00:16:11 +0000 (UTC) (envelope-from ask@develooper.com) Received: from mbox1.develooper.com (mbox1.develooper.com [207.171.7.178]) by mx1.freebsd.org (Postfix) with ESMTP id 98D7A8FC12 for ; Tue, 11 Dec 2012 00:16:11 +0000 (UTC) Received: from mbox1.develooper.com (mbox1.develooper.com [127.0.0.1]) by mbox1.develooper.com (Postfix) with ESMTP id DE33F175A9F for ; Mon, 10 Dec 2012 15:58:50 -0800 (PST) Received: (qmail 32419 invoked from network); 10 Dec 2012 23:58:50 -0000 Received: from unknown (HELO ask.bur.sol) (ask@mail.dev@64.235.248.131) by smtp.develooper.com with ESMTPA; 10 Dec 2012 23:58:50 -0000 From: =?iso-8859-1?Q?Ask_Bj=F8rn_Hansen?= Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Subject: freebsd-update mergemaster options Message-Id: <612DB7D4-07CA-4C48-98F8-081C33E85812@develooper.com> Date: Mon, 10 Dec 2012 15:58:50 -0800 To: freebsd-stable@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 6.2 \(1499\)) X-Mailer: Apple Mail (2.1499) X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Dec 2012 00:16:11 -0000 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:.*[$]'=