From owner-freebsd-questions@FreeBSD.ORG  Thu Sep 23 14:54:38 2010
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 3CF50106566B
	for <freebsd-questions@freebsd.org>;
	Thu, 23 Sep 2010 14:54:38 +0000 (UTC)
	(envelope-from elon@emmi.physik-pool.tu-berlin.de)
Received: from emmi.physik-pool.tu-berlin.de (emmi.physik-pool.tu-berlin.de
	[130.149.58.146])
	by mx1.freebsd.org (Postfix) with ESMTP id 115EB8FC12
	for <freebsd-questions@freebsd.org>;
	Thu, 23 Sep 2010 14:54:36 +0000 (UTC)
Received: from emmi.physik-pool.tu-berlin.de
	(localhost.physik-pool.tu-berlin.de [127.0.0.1])
	by emmi.physik-pool.tu-berlin.de (8.14.4/8.14.4) with ESMTP id
	o8NEsYkc023100 for <freebsd-questions@freebsd.org>;
	Thu, 23 Sep 2010 16:54:34 +0200 (CEST)
	(envelope-from elon@emmi.physik-pool.tu-berlin.de)
Received: (from elon@localhost)
	by emmi.physik-pool.tu-berlin.de (8.14.4/8.14.4/Submit) id
	o8NEsYbh023099 for freebsd-questions@freebsd.org;
	Thu, 23 Sep 2010 16:54:34 +0200 (CEST) (envelope-from elon)
Date: Thu, 23 Sep 2010 16:54:34 +0200
From: Leon =?iso-8859-15?Q?Me=DFner?= <l.messner@physik.tu-berlin.de>
To: freebsd-questions@freebsd.org
Message-ID: <20100923145434.GN15702@emmi.physik-pool.tu-berlin.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.20 (2009-06-14)
Subject: Does this look reasonable (y/n)?
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: Thu, 23 Sep 2010 14:54:38 -0000

Hello,

i have quite a common question i think but my google skills didn't bring
up anything decent. If you use binary freebsd-update to upgrade between
major releases it starts comparing config files at some point. After the
manual merges it start's "automerge" and asks you:

Does this look reasonable (y/n)?

for every file. If you answer n freebsd-update bails out (after working
for like ages getting patches/files etc.) So wouldn't it be nice to give
the user a chance to resolve the merge or at least ask if the user
really wants to quit the upgrade.

Am i missing something here?

regards,
leon