From owner-freebsd-questions@FreeBSD.ORG  Mon Mar  3 16:10:54 2008
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 3B9FD106566B
	for <freebsd-questions@freebsd.org>;
	Mon,  3 Mar 2008 16:10:54 +0000 (UTC)
	(envelope-from chris@chrismaness.com)
Received: from ns1.kq6up.org (adsl-76-238-148-145.dsl.irvnca.sbcglobal.net
	[76.238.148.145])
	by mx1.freebsd.org (Postfix) with ESMTP id 29DE08FC3A
	for <freebsd-questions@freebsd.org>;
	Mon,  3 Mar 2008 16:10:53 +0000 (UTC)
	(envelope-from chris@chrismaness.com)
Received: from squirrel.kq6up.org (localhost [127.0.0.1])
	by ns1.kq6up.org (8.14.2/8.14.2) with ESMTP id m23GAqrM055071
	for <freebsd-questions@freebsd.org>;
	Mon, 3 Mar 2008 08:10:52 -0800 (PST)
	(envelope-from chris@chrismaness.com)
Received: from 163.150.112.33 (SquirrelMail authenticated user chris)
	by squirrel.kq6up.org with HTTP; Mon, 3 Mar 2008 08:10:52 -0800 (PST)
Message-ID: <1562.163.150.112.33.1204560652.squirrel@squirrel.kq6up.org>
Date: Mon, 3 Mar 2008 08:10:52 -0800 (PST)
From: chris@chrismaness.com
To: freebsd-questions@freebsd.org
User-Agent: SquirrelMail/1.4.11
MIME-Version: 1.0
Content-Type: text/plain;charset=iso-8859-1
Content-Transfer-Encoding: 8bit
X-Priority: 3 (Normal)
Importance: Normal
Subject: Re: freebsd-update and mergemaster
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, 03 Mar 2008 16:10:54 -0000

> Chris Maness <chris@chrismaness.com> writes:
>
>> I was wondering if it was possible to use mergemaster with the binary
>> update tool.  It seemed like a much better way than freebsd-update
>> dumping me into vi.  I don't understand what it wants me to do with
>> vi.  Mergemaster is very clear.  Can someone please shed light.
>
> Mergemaster just uses sdiff(1).  Perhaps freebsd-update can be
> configured (e.g., with an EDITOR setting) to do the same?
>

The mergemaster is a nice implementation as it really lets you see what is
going on during the whole process.  I like the the whole script as it lets
you choose what version you want to keep for each and every file.

Who is working on FreeBSD update?  Maybe I can make a feature request.

Chris