From owner-cvs-all@FreeBSD.ORG  Thu Aug 31 17:27:59 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AAE6416A4DE;
	Thu, 31 Aug 2006 17:27:59 +0000 (UTC) (envelope-from obrien@NUXI.com)
Received: from dragon.NUXI.org (trang.nuxi.com [66.93.134.19])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2656E43D45;
	Thu, 31 Aug 2006 17:27:59 +0000 (GMT) (envelope-from obrien@NUXI.com)
Received: from dragon.NUXI.org (obrien@localhost [127.0.0.1])
	by dragon.NUXI.org (8.13.7/8.13.7) with ESMTP id k7VHRsV8060576;
	Thu, 31 Aug 2006 10:27:54 -0700 (PDT)
	(envelope-from obrien@dragon.NUXI.org)
Received: (from obrien@localhost)
	by dragon.NUXI.org (8.13.7/8.13.7/Submit) id k7VHRsVI060575;
	Thu, 31 Aug 2006 10:27:54 -0700 (PDT) (envelope-from obrien)
Date: Thu, 31 Aug 2006 10:27:54 -0700
From: "David O'Brien" <obrien@FreeBSD.org>
To: Dag-Erling =?unknown-8bit?Q?Sm=F8rgrav?= <des@des.no>
Message-ID: <20060831172754.GB60337@dragon.NUXI.org>
References: <200608290920.k7T9KmV9067843@repoman.freebsd.org>
	<86zmdmfoow.fsf@dwp.des.no>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <86zmdmfoow.fsf@dwp.des.no>
X-Operating-System: FreeBSD 7.0-CURRENT
Organization: The NUXI BSD Group
X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3  90 76 5D 69 58 D9 98 7A
X-Pgp-Rsa-Keyid: 1024/34F9F9D5
User-Agent: Mutt/1.5.11
Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/etc hosts.allow
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: obrien@FreeBSD.org
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 Aug 2006 17:27:59 -0000

On Wed, Aug 30, 2006 at 01:27:59PM +0200, Dag-Erling Smrgrav wrote:
> Ruslan Ermilov <ru@FreeBSD.org> writes:
> >   Modified files:
> >     etc                  hosts.allow
> >   Log:
> >   Comment out lines that use example addresses and example.com names so
> >   that local changes can be made more easily (without having to comment
> >   these lines, and making the diff more readable).
> 
> That reminds me - /etc/hosts is another file that mergemaster often
> trips over.

What does that mean?
In my experience Mergemaster "trips over" every /etc modified file that I
haven't locally edited.

-- 
-- David  (obrien@FreeBSD.org)