Date: Wed, 11 Jul 2007 20:59:58 +0200 From: Henrik Brix Andersen <henrik@brixandersen.dk> To: Gaspar Chilingarov <casper@web.am> Cc: Pieter de Goeje <pieter@degoeje.nl>, Doug Barton <dougb@FreeBSD.org>, freebsd-current@freebsd.org Subject: Re: RFT: bin/106642: [patch] Allow excluding certain files from mergemaster (8) Message-ID: <20070711185958.GA37496@tirith.brixandersen.dk> In-Reply-To: <4694AAF1.6050302@web.am> References: <20070419133550.GA65054@tirith.brixandersen.dk> <20070419200929.GA70735@tirith.brixandersen.dk> <4693BC3E.1050605@web.am> <200707110115.42139.pieter@degoeje.nl> <469417CB.7010705@FreeBSD.org> <4694AAF1.6050302@web.am>
next in thread | previous in thread | raw e-mail | index | archive | help
--OgqxwSJOaUobr8KG Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jul 11, 2007 at 03:03:29PM +0500, Gaspar Chilingarov wrote: > Well another question -- is it possible teach somehow mergemaster, that i= t=20 > should never touch passwd, groups, /etc/ttys or bunch of another files? That's actually the exact functionality added by the patch mentioned in the Subject line of this thread. Regards, Brix --=20 Henrik Brix Andersen <henrik@brixandersen.dk> --OgqxwSJOaUobr8KG Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (FreeBSD) Comment: GnuPG signed iD8DBQFGlSitv+Q4flTiePgRAtQBAKDGVLNRO94sNg7S98kwCDWJq3FQNgCfYxX8 aVhcf9LuDIpDtMN5e4DEWaE= =TRHz -----END PGP SIGNATURE----- --OgqxwSJOaUobr8KG--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070711185958.GA37496>