From owner-freebsd-questions@FreeBSD.ORG  Sun Jan 20 18:27:08 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 E03CD16A41A
	for <freebsd-questions@freebsd.org>;
	Sun, 20 Jan 2008 18:27:08 +0000 (UTC)
	(envelope-from zszalbot@gmail.com)
Received: from nf-out-0910.google.com (nf-out-0910.google.com [64.233.182.185])
	by mx1.freebsd.org (Postfix) with ESMTP id 764C713C4D3
	for <freebsd-questions@freebsd.org>;
	Sun, 20 Jan 2008 18:27:08 +0000 (UTC)
	(envelope-from zszalbot@gmail.com)
Received: by nf-out-0910.google.com with SMTP id b2so189763nfb.33
	for <freebsd-questions@freebsd.org>;
	Sun, 20 Jan 2008 10:27:07 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	bh=af3l2o4QI1jykql+VdTloI6WykDXMKhMPEFasN+0qf0=;
	b=Z4tSj22mA2Dr5Txf8160NvsGOdYoWwQCtfgEulmFTvHCA1tYz/Yz7m5fbzKk4AP2xHcJkOR9EwthsodJGDNCwOTcCFxbOQ4IFBvtQJz8wFkytlO2ZXxzWIz0RuEEGUBgGtqsJS3CU4X9ezr0TTS/zcHM6ajxpD5Itz8mgN9vDwA=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=hzMZKmlrbzpZWWSAV0Jf8D+as8FAlq8iq6seVA+UleYGy0j6ctbkDUD/tmHMAOV32OOklz9hBkUdI73nVhzVhFzYEpVhvmsLOmgj1Ou/IlIcPJPmtY26XBVtlBo9kWkNfowzt7o++g1VeDf7sgzmn90utUj9C8GiTgtwH4kvsAI=
Received: by 10.78.83.15 with SMTP id g15mr8095019hub.6.1200853626772;
	Sun, 20 Jan 2008 10:27:06 -0800 (PST)
Received: by 10.78.130.5 with HTTP; Sun, 20 Jan 2008 10:27:06 -0800 (PST)
Message-ID: <94136a2c0801201027o3a00a333w5c98d8192f2abea3@mail.gmail.com>
Date: Sun, 20 Jan 2008 19:27:06 +0100
From: "Zbigniew Szalbot" <zszalbot@gmail.com>
To: RW <fbsd06@mlists.homeunix.com>
In-Reply-To: <20080120180120.6cc96f9a@gumby.homeunix.com.>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <94136a2c0801191142r51a7715by99e56ee658621e5d@mail.gmail.com>
	<20080120000048.0cee1189@gumby.homeunix.com.>
	<94136a2c0801200713k3fdda593m4da8c93b23feaa0d@mail.gmail.com>
	<20080120180120.6cc96f9a@gumby.homeunix.com.>
Cc: freebsd-questions@freebsd.org
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:27:09 -0000

Hello,

2008/1/20, RW <fbsd06@mlists.homeunix.com>:
> 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?

No, it says (for example)

The following file could not be merged automatically:
/etc/defaults/periodic.conf
Press Enter to edit this file in vi and resolve the conflicts
manually...

So I have the vi open but I wonder which lines to remove and which to leave?

Thanks!

Zbigniew Szalbot