Date: Thu, 24 Feb 2011 06:05:12 +0000 From: Matthew Seaman <m.seaman@infracaninophile.co.uk> To: freebsd-questions@freebsd.org Cc: David Demelier <demelier.david@gmail.com>, Lowell Gilbert <freebsd-questions-local@be-well.ilk.org> Subject: Re: mergemaster -U ask for a lot non-user modified files Message-ID: <4D65F518.9020700@infracaninophile.co.uk> In-Reply-To: <44mxlmtn3i.fsf@be-well.ilk.org> References: <4D5CCB72.20505@gmail.com> <44ei75xyn6.fsf@be-well.ilk.org> <4D6580EC.8090007@gmail.com> <44mxlmtn3i.fsf@be-well.ilk.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <demelier.david@gmail.com> 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4D65F518.9020700>