From owner-freebsd-questions@FreeBSD.ORG Thu Feb 24 06:05:29 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 C837B106566B for ; Thu, 24 Feb 2011 06:05:29 +0000 (UTC) (envelope-from m.seaman@infracaninophile.co.uk) Received: from smtp.infracaninophile.co.uk (smtp6.infracaninophile.co.uk [IPv6:2001:8b0:151:1:3fd3:cd67:fafa:3d78]) by mx1.freebsd.org (Postfix) with ESMTP id 28C368FC1A for ; Thu, 24 Feb 2011 06:05:29 +0000 (UTC) Received: from seedling.black-earth.co.uk (seedling.black-earth.co.uk [81.187.76.163]) (authenticated bits=0) by smtp.infracaninophile.co.uk (8.14.4/8.14.4) with ESMTP id p1O65JHH041868 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Thu, 24 Feb 2011 06:05:19 GMT (envelope-from m.seaman@infracaninophile.co.uk) X-DKIM: Sendmail DKIM Filter v2.8.3 smtp.infracaninophile.co.uk p1O65JHH041868 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=infracaninophile.co.uk; s=201001-infracaninophile; t=1298527520; bh=Sc8zSxc/cpTaDCoNRiHcOI4lGE9VxfYX1cHad9sv81s=; h=Message-ID:Date:From:MIME-Version:To:CC:Subject:References: In-Reply-To:Content-Type:Cc:Content-Type:Date:From:In-Reply-To: Message-ID:Mime-Version:References:To; z=Message-ID:=20<4D65F518.9020700@infracaninophile.co.uk>|Date:=20T hu,=2024=20Feb=202011=2006:05:12=20+0000|From:=20Matthew=20Seaman= 20|User-Agent:=20Mozilla/5.0=20(M acintosh=3B=20U=3B=20Intel=20Mac=20OS=20X=2010.6=3B=20en-US=3B=20r v:1.9.2.13)=20Gecko/20101207=20Thunderbird/3.1.7|MIME-Version:=201 .0|To:=20freebsd-questions@freebsd.org|CC:=20Lowell=20Gilbert=20,=20=0D=0A=20David=20Demeli er=20|Subject:=20Re:=20mergemaster=20-U= 20ask=20for=20a=20lot=20non-user=20modified=20files|References:=20 <4D5CCB72.20505@gmail.com>=20<44ei75xyn6.fsf@be-well.ilk.org>=09<4 D6580EC.8090007@gmail.com>=20<44mxlmtn3i.fsf@be-well.ilk.org>|In-R eply-To:=20<44mxlmtn3i.fsf@be-well.ilk.org>|X-Enigmail-Version:=20 1.1.1|OpenPGP:=20id=3D60AE908C|Content-Type:=20multipart/signed=3B =20micalg=3Dpgp-sha1=3B=0D=0A=20protocol=3D"application/pgp-signat ure"=3B=0D=0A=20boundary=3D"------------enig4EAAB632F79A22594C0D52 56"; b=SctUHABySeG8DTKVZOBPZhbvyA0jiv9ucoIudXH6rq+HtgWhrTNPI1Wo14VMrHLno /ASvzFyJWOsT8p5pqMwhJYNb7wdG5rprIQEy7asIAPP+0W17UlqnRvzMtooaMccyR2 Mqln9VeHxjI5m3AZ9OkslBHTAlb4PkIUvX1ZMC+8= Message-ID: <4D65F518.9020700@infracaninophile.co.uk> Date: Thu, 24 Feb 2011 06:05:12 +0000 From: Matthew Seaman User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.13) Gecko/20101207 Thunderbird/3.1.7 MIME-Version: 1.0 To: freebsd-questions@freebsd.org References: <4D5CCB72.20505@gmail.com> <44ei75xyn6.fsf@be-well.ilk.org> <4D6580EC.8090007@gmail.com> <44mxlmtn3i.fsf@be-well.ilk.org> In-Reply-To: <44mxlmtn3i.fsf@be-well.ilk.org> X-Enigmail-Version: 1.1.1 OpenPGP: id=60AE908C Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig4EAAB632F79A22594C0D5256" X-Virus-Scanned: clamav-milter 0.97 at lucid-nonsense.infracaninophile.co.uk X-Virus-Status: Clean X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_FAIL autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on lucid-nonsense.infracaninophile.co.uk Cc: David Demelier , Lowell Gilbert Subject: Re: mergemaster -U ask for a lot non-user modified files X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 06:05:29 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig4EAAB632F79A22594C0D5256 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 23/02/2011 22:14, Lowell Gilbert wrote: > David Demelier writes: >=20 >> I also noticed that even with the -F flag, mergemaster still asks for >> files that only differs by CVS id, see : >> >> -##### $FreeBSD: src/etc/sendmail/freebsd.mc,v 1.37.2.2.2.1 >> 2010/06/14 02:09:0 6 kensmith Exp $ ##### >> +##### $FreeBSD: src/etc/sendmail/freebsd.mc,v 1.37.2.2.4.1 >> 2010/12/21 17:09:2 5 kensmith Exp $ ##### >=20 > Again, I think this is a local problem on your system. =20 > It certainly works on my system (RELENG_8, updated this week). mergemaster -U functionality depends on mergemaster having recorded an mtree database of what the contents of your /etc (and various other bits) looks like. The first time you run mergemaster with the -U flag, it's going to ask you about a lot of files -- but after that, it remembers and you only get asked about updating files you've previously modified. The recommendation for minimizing the amount of questions asked is: * the first time you run mergemaster, on a newly installed machine: mergemaster -UFi (This will involve quite a lot of user interaction) * for any subsequent updates: mergemaster -Ui (Which will be much more automated) The other handy tip is to make sure you don't delete the $FreeBSD$ tags from your fles, and that when the file is modified upstream, you merge in the new value for the tag. Doing this certainly works for me -- frequently the only file I get asked about is /etc/motd Cheers, Matthew --=20 Dr Matthew J Seaman MA, D.Phil. 7 Priory Courtyard Flat 3 PGP: http://www.infracaninophile.co.uk/pgpkey Ramsgate JID: matthew@infracaninophile.co.uk Kent, CT11 9PW --------------enig4EAAB632F79A22594C0D5256 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.16 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk1l9R8ACgkQ8Mjk52CukIxoRgCfYTtaTPq5Q+loRKm8a94w0Tag y7AAnRS7qODdMzOyolNXE/DKliFblmui =wreF -----END PGP SIGNATURE----- --------------enig4EAAB632F79A22594C0D5256--