From owner-freebsd-questions@FreeBSD.ORG  Sun Jan 20 18:01:27 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 65E2616A417
	for <freebsd-questions@freebsd.org>;
	Sun, 20 Jan 2008 18:01:27 +0000 (UTC)
	(envelope-from fbsd06+SK=d329cc7e@mlists.homeunix.com)
Received: from mxout-04.mxes.net (mxout-04.mxes.net [216.86.168.179])
	by mx1.freebsd.org (Postfix) with ESMTP id 4783413C442
	for <freebsd-questions@freebsd.org>;
	Sun, 20 Jan 2008 18:01:27 +0000 (UTC)
	(envelope-from fbsd06+SK=d329cc7e@mlists.homeunix.com)
Received: from gumby.homeunix.com. (unknown [87.81.140.128])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.mxes.net (Postfix) with ESMTP id 643AED05A4
	for <freebsd-questions@freebsd.org>;
	Sun, 20 Jan 2008 13:01:23 -0500 (EST)
Date: Sun, 20 Jan 2008 18:01:20 +0000
From: RW <fbsd06@mlists.homeunix.com>
To: freebsd-questions@freebsd.org
Message-ID: <20080120180120.6cc96f9a@gumby.homeunix.com.>
In-Reply-To: <94136a2c0801200713k3fdda593m4da8c93b23feaa0d@mail.gmail.com>
References: <94136a2c0801191142r51a7715by99e56ee658621e5d@mail.gmail.com>
	<20080120000048.0cee1189@gumby.homeunix.com.>
	<94136a2c0801200713k3fdda593m4da8c93b23feaa0d@mail.gmail.com>
X-Mailer: Claws Mail 3.0.2 (GTK+ 2.12.5; i386-portbld-freebsd7.0)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: 6.2-Release to 6.3-Release and automatically merge changes
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: Sun, 20 Jan 2008 18:01:27 -0000

On Sun, 20 Jan 2008 16:13:26 +0100
"Zbigniew Szalbot" <zszalbot@gmail.com> wrote:


> Which lines should I delete and which leave intact?
> This one here is short but there are some other where the changes
> apply to quite a few lines. I have trouble finding out how to "accept
> the new versions"?

I've not used freebsd-update.sh, I assumed it was just calling
mergemaster. Does it really not give you option of accepting a whole
file?