From owner-freebsd-questions@FreeBSD.ORG  Mon Apr  6 15:24:29 2009
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
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 615E21065731
	for <freebsd-questions@freebsd.org>;
	Mon,  6 Apr 2009 15:24:29 +0000 (UTC)
	(envelope-from sonic2000gr@gmail.com)
Received: from mail-fx0-f167.google.com (mail-fx0-f167.google.com
	[209.85.220.167])
	by mx1.freebsd.org (Postfix) with ESMTP id E082D8FC0C
	for <freebsd-questions@freebsd.org>;
	Mon,  6 Apr 2009 15:24:28 +0000 (UTC)
	(envelope-from sonic2000gr@gmail.com)
Received: by fxm11 with SMTP id 11so1890900fxm.43
	for <freebsd-questions@freebsd.org>;
	Mon, 06 Apr 2009 08:24:28 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:received:message-id:date:from
	:user-agent:mime-version:to:cc:subject:references:in-reply-to
	:content-type:content-transfer-encoding;
	bh=N+EkKmjiU384h52Y5BeZ7KJNw858VCvm6amaNcuSfxE=;
	b=DBT+OVmYu9GVg3pVVQisvxLnuXpSvdQFy1g4+mdVGKEF/20zcaBg/DD+h2q+1D0sBu
	7Ametfkj+Po+kGL6KvNOikcdm1kE8eVoHS9VTN/TYmMOSQu/FYq5my6mpZi1VouPhSJM
	qk+WJFwkZm6YVbnwmTRQz6QFDU/LA9YmqhzVI=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=message-id:date:from:user-agent:mime-version:to:cc:subject
	:references:in-reply-to:content-type:content-transfer-encoding;
	b=w0t9gvHe1CYeX/DQfNncH3+/D/lig2OeE56K4fKIXTzagKcfiUQBAUuAlPyBjhf0n3
	yv+qTh+rhF+QPD29YEIE3kLfP4Haiy+T96VwhjgpDEIGPTHaZUQdZCWNbPx6gBEQD4Bz
	x3OtYua7HR7muLq/awSz4C6w6IzKRRA8nrQtA=
Received: by 10.86.91.3 with SMTP id o3mr3288994fgb.17.1239031468057;
	Mon, 06 Apr 2009 08:24:28 -0700 (PDT)
Received: from atlantis.dyndns.org (ppp-94-69-68-78.home.otenet.gr
	[94.69.68.78])
	by mx.google.com with ESMTPS id e20sm12236054fga.4.2009.04.06.08.24.27
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Mon, 06 Apr 2009 08:24:27 -0700 (PDT)
Message-ID: <49DA1EAA.7030602@gmail.com>
Date: Mon, 06 Apr 2009 18:24:26 +0300
From: Manolis Kiagias <sonic2000gr@gmail.com>
User-Agent: Thunderbird 2.0.0.21 (X11/20090330)
MIME-Version: 1.0
To: Charles Howse <chowse@charter.net>
References: <AC90374B-AD31-4E02-955E-791C7BB8FB6F@charter.net>
	<49D9EFA8.709@gmail.com>
	<A78701B2-ACC1-4CF1-8AF8-D76CACDCEDDB@charter.net>
In-Reply-To: <A78701B2-ACC1-4CF1-8AF8-D76CACDCEDDB@charter.net>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: FreeBSD Questions <freebsd-questions@freebsd.org>
Subject: Re: mergemaster options
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Apr 2009 15:24:29 -0000

Charles Howse wrote:
>
>
> Actually, I wasn't asking about the CVS line with regard to
> mergemaster.  I realize that mergemaster will stop and ask about any
> file in its list with a CVS line older than the new file.
>
> What I really want to know is, let's say the file above is
> /etc/hosts.allow, and I have customized it according to my needs.
> If I leave the old file in /etc, I'm thinking it will still work just
> fine.  It's only mergemaster, and maybe cvsup, and things that
> actually deal with version control that are concerned with the CVS line.
> Am I correct?
>
>
>
You are correct. As long as the content of the file is right for the
purpose, the line added by CVS is simply ignored by anything and
everything - except mergemaster and friends when upgrading.