From owner-freebsd-stable@FreeBSD.ORG  Tue Sep 23 01:27:38 2003
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3396416A527
	for <stable@freebsd.org>; Tue, 23 Sep 2003 01:27:38 -0700 (PDT)
Received: from sequel.rsm.ru (sequel.rsm.ru [213.80.139.149])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BD9A843FF9
	for <stable@freebsd.org>; Tue, 23 Sep 2003 01:27:35 -0700 (PDT)
	(envelope-from aga@rsm.ru)
Received: from rsm.ru (magic.rsm.ru [213.80.139.148])h8N80LK82192;
	Tue, 23 Sep 2003 12:00:21 +0400 (MSD)
Message-ID: <3F6FFD90.1060706@rsm.ru>
Date: Tue, 23 Sep 2003 12:00:16 +0400
From: Dmitry Agafonov <aga@rsm.ru>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.3) Gecko/20030423
X-Accept-Language: ru, en-us, en
MIME-Version: 1.0
To: Mike Porter <mupi@mknet.org>
References: <12829.1064235540@thrush.ravenbrook.com> <3F6F0A0C.1060308@rsm.ru>
	<447k404pr5.fsf@be-well.ilk.org> <200309221814.26301.mupi@mknet.org>
In-Reply-To: <200309221814.26301.mupi@mknet.org>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: OK
cc: stable@freebsd.org
Subject: Re: About mergemaster (Re: upgrading)
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Production branch of FreeBSD source code
	<freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Sep 2003 08:27:38 -0000

I think it is better to say
"file rc.network is unchaged from default, but the new version is different
(v)iew/(i)nstall/install (a)ll similar/(d)elete? [v]"
or something...

Mike Porter wrote:

>I would strongly support a mechanism for asking for user input: "file 
>rc.network is unchaged from default, but the new version is different.  
>(v)iew/(c)ontinue? [v]"  This would give the user the choice to be ignorant, 
>and sometimes, I would choose that, jsut becuase I want to get done 
>(especially if I am merging on the second or third machine, let alone 50 or 
>100)...also a scripting mechanism to automate installation on multiple 
>machines.
>  
>