From owner-freebsd-questions@FreeBSD.ORG  Tue Jul 27 17:01:42 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 5FAC2106564A
	for <freebsd-questions@freebsd.org>;
	Tue, 27 Jul 2010 17:01:42 +0000 (UTC)
	(envelope-from swell.k@gmail.com)
Received: from mail-ew0-f54.google.com (mail-ew0-f54.google.com
	[209.85.215.54])
	by mx1.freebsd.org (Postfix) with ESMTP id DF78F8FC26
	for <freebsd-questions@freebsd.org>;
	Tue, 27 Jul 2010 17:01:41 +0000 (UTC)
Received: by ewy26 with SMTP id 26so1522348ewy.13
	for <freebsd-questions@freebsd.org>;
	Tue, 27 Jul 2010 10:01:40 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:received:from:to:cc:subject:references
	:date:in-reply-to:message-id:user-agent:mime-version:content-type;
	bh=4eu89FC1F+YrFckgCoxJQI7b2qaAATLu5qkya7EPEFM=;
	b=dGVOt/u58zV4APr9EHB1CbF+fC2JvmoNgEXMyoSRxTZMPsOrd6sntrNM3CI8pLntjc
	YlZO7JMHpV/Af4XkejRowFWSeg/CikRZcg59EyneJJydwlLpdbAhE9au6bA262PyvCGT
	Yf76rma6GF1gH/uQCxSa4w3yew7rXbvd/SzOU=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=from:to:cc:subject:references:date:in-reply-to:message-id
	:user-agent:mime-version:content-type;
	b=lid852iZie5fbWTPVAaNyxPa1dbOgQiTOe0819XpfTSis4gISHbCn9o5zQ2MVLFw2W
	EAOmqhb1uyO914c42IOQr1ugkT+abz5k7bVRAN4ffVQAqxH3mH68hmneZ+209wJyyn0n
	G5jp2ayN4wsfqj5CqmK6LxocLBeM354u9Ykmw=
Received: by 10.14.29.13 with SMTP id h13mr1294572eea.35.1280250100450;
	Tue, 27 Jul 2010 10:01:40 -0700 (PDT)
Received: from localhost ([95.143.193.145])
	by mx.google.com with ESMTPS id a48sm7871740eei.0.2010.07.27.10.01.38
	(version=SSLv3 cipher=RC4-MD5); Tue, 27 Jul 2010 10:01:39 -0700 (PDT)
From: Anonymous <swell.k@gmail.com>
To: zaxis <z_axis@163.com>
References: <29262747.post@talk.nabble.com>
	<201007260917.32632.jmc-freebsd2@milibyte.co.uk>
	<29272211.post@talk.nabble.com>
	<20100727123140.GA5410@orange.esperance-linux.co.uk>
Date: Tue, 27 Jul 2010 21:01:13 +0400
In-Reply-To: <20100727123140.GA5410@orange.esperance-linux.co.uk> (Frank
	Shute's message of "Tue, 27 Jul 2010 13:31:40 +0100")
Message-ID: <86vd8097vq.fsf@gmail.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: freebsd-questions@freebsd.org
Subject: Re: I donot like using 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: Tue, 27 Jul 2010 17:01:42 -0000

Frank Shute <frank@shute.org.uk> writes:

> On Mon, Jul 26, 2010 at 06:18:22PM -0700, zaxis wrote:
>>
>> 
>> that's great ! I will use /etc/mergemaster.rc to upgrade my FB 8.0.
>> 
>
> You might also want to put this line in mergemaster.rc:
>
> DIFF_OPTIONS='-I$FreeBSD:.*[$]'

I think it's already done by FREEBSD_ID (-F) in rc file.