From owner-freebsd-questions@FreeBSD.ORG Sun Nov 6 21:46:31 2011 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB0B3106564A for ; Sun, 6 Nov 2011 21:46:31 +0000 (UTC) (envelope-from frank@esperance-linux.co.uk) Received: from asmtp3.iomartmail.com (asmtp3.iomartmail.com [62.128.201.159]) by mx1.freebsd.org (Postfix) with ESMTP id 573888FC14 for ; Sun, 6 Nov 2011 21:46:30 +0000 (UTC) Received: from asmtp3.iomartmail.com (localhost.localdomain [127.0.0.1]) by asmtp3.iomartmail.com (8.13.8/8.13.8) with ESMTP id pA6Lk4dp011060; Sun, 6 Nov 2011 21:46:04 GMT Received: from orange.esperance-linux.co.uk (host-92-22-130-66.as13285.net [92.22.130.66]) (authenticated bits=0) by asmtp3.iomartmail.com (8.13.8/8.13.8) with ESMTP id pA6Lk4FM011053; Sun, 6 Nov 2011 21:46:04 GMT Received: by orange.esperance-linux.co.uk (Postfix, from userid 1001) id C959A33C1F; Sun, 6 Nov 2011 21:46:03 +0000 (GMT) Date: Sun, 6 Nov 2011 21:46:03 +0000 From: Frank Shute To: "Randal L. Schwartz" Message-ID: <20111106214603.GB96452@orange.esperance-linux.co.uk> References: <867h3ddped.fsf@red.stonehenge.com> <86y5vtc9ho.fsf@red.stonehenge.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="rS8CxjVDS/+yyDmU" Content-Disposition: inline In-Reply-To: <86y5vtc9ho.fsf@red.stonehenge.com> User-Agent: Mutt/1.4.2.3i X-Face: *}~{PHnDTzvXPe'wl_-f%!@+r5; VLhb':*DsX%wEOPg\fDrXWQJf|2\,92"DdS%63t*BHDyQ|OWo@Gfjcd72eaN!4%NE{0]p)ihQ1MyFNtWL X-Operating-System: FreeBSD 8.2-STABLE amd64 X-Organisation: 'shute.org.uk' Cc: Mark Felder , freebsd-questions@freebsd.org Subject: Re: painful binary upgrade from 8.1 to 8.2 X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Frank Shute List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 21:46:31 -0000 --rS8CxjVDS/+yyDmU Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Nov 06, 2011 at 11:54:27AM -0800, Randal L. Schwartz wrote: > > >>>>> "Mark" =3D=3D Mark Felder writes: >=20 > Mark> Does freebsd-update follow /etc/mergemaster.rc? >=20 > No, apparently it just calls classic "merge", which doesn't have any > kind of "ignore CVS tags". No wonder it's painful. >=20 > But surely, I'm not the only one using freebsd-update. Does everyone > else put up with this, or is there some additional tool I'm missing? >=20 I had the exact same problem when going from 7.3 to 7.4 The result: I don't use freebsd-update any longer and update the traditional way from source. AFAIK, I followed the instructions to the letter. I would be interested to see if there is a workaround, otherwise it seems that freebsd-update is the long way of updating; assuming you've got the "ignore CVS tags" flag enabled in mergemaster.rc Regards, --=20 Frank Contact info: http://www.shute.org.uk/misc/contact.html --rS8CxjVDS/+yyDmU Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (FreeBSD) iEYEARECAAYFAk63ABoACgkQHduKvUAgeK4kkwCglNVkXf3s7rrX5sUEIFJx3Q1D 9nsAn1NDRaH1iDsnOZoPgTTVpZWhO58b =d2eG -----END PGP SIGNATURE----- --rS8CxjVDS/+yyDmU--