From owner-freebsd-current@FreeBSD.ORG  Wed Jul 11 19:00:00 2007
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
X-Original-To: freebsd-current@freebsd.org
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 389D116A400;
	Wed, 11 Jul 2007 19:00:00 +0000 (UTC)
	(envelope-from henrik@brixandersen.dk)
Received: from solow.pil.dk (relay.pil.dk [195.41.47.164])
	by mx1.freebsd.org (Postfix) with ESMTP id EE5AF13C46E;
	Wed, 11 Jul 2007 18:59:59 +0000 (UTC)
	(envelope-from henrik@brixandersen.dk)
Received: from tirith.brixandersen.dk (osgiliath.brixandersen.dk
	[87.53.223.189]) by solow.pil.dk (Postfix) with ESMTP id 379141CC0F2;
	Wed, 11 Jul 2007 20:59:59 +0200 (CEST)
Received: by tirith.brixandersen.dk (Postfix, from userid 1001)
	id 732D4B813; Wed, 11 Jul 2007 20:59:58 +0200 (CEST)
Date: Wed, 11 Jul 2007 20:59:58 +0200
From: Henrik Brix Andersen <henrik@brixandersen.dk>
To: Gaspar Chilingarov <casper@web.am>
Message-ID: <20070711185958.GA37496@tirith.brixandersen.dk>
Mail-Followup-To: Gaspar Chilingarov <casper@web.am>,
	Doug Barton <dougb@FreeBSD.org>,
	Pieter de Goeje <pieter@degoeje.nl>, freebsd-current@freebsd.org
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>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="OgqxwSJOaUobr8KG"
Content-Disposition: inline
In-Reply-To: <4694AAF1.6050302@web.am>
X-PGP-Key: http://www.brixandersen.dk/files/HenrikBrixAndersen.asc
User-Agent: Mutt/1.5.16 (2007-06-09)
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)
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Jul 2007 19:00:00 -0000


--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--