From owner-freebsd-questions@FreeBSD.ORG  Tue Jul 27 12:49:13 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 6A897106570C
	for <freebsd-questions@freebsd.org>;
	Tue, 27 Jul 2010 12:49:13 +0000 (UTC)
	(envelope-from frank@esperance-linux.co.uk)
Received: from asmtp1.iomartmail.com (asmtp1.iomartmail.com [62.128.201.248])
	by mx1.freebsd.org (Postfix) with ESMTP id F2E7A8FC0C
	for <freebsd-questions@freebsd.org>;
	Tue, 27 Jul 2010 12:49:12 +0000 (UTC)
Received: from asmtp1.iomartmail.com (localhost.localdomain [127.0.0.1])
	by asmtp1.iomartmail.com (8.13.8/8.13.8) with ESMTP id o6RCmrvN012808; 
	Tue, 27 Jul 2010 13:48:53 +0100
Received: from orange.esperance-linux.co.uk
	(80-45-152-196.static.dsl.as9105.com [80.45.152.196])
	(authenticated bits=0)
	by asmtp1.iomartmail.com (8.13.8/8.13.8) with ESMTP id o6RCmrRW012804; 
	Tue, 27 Jul 2010 13:48:53 +0100
Received: by orange.esperance-linux.co.uk (Postfix, from userid 1001)
	id 869D333C3D; Tue, 27 Jul 2010 13:31:40 +0100 (BST)
Date: Tue, 27 Jul 2010 13:31:40 +0100
From: Frank Shute <frank@shute.org.uk>
To: zaxis <z_axis@163.com>
Message-ID: <20100727123140.GA5410@orange.esperance-linux.co.uk>
Mail-Followup-To: zaxis <z_axis@163.com>, freebsd-questions@freebsd.org
References: <29262747.post@talk.nabble.com>
	<201007260917.32632.jmc-freebsd2@milibyte.co.uk>
	<29272211.post@talk.nabble.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <29272211.post@talk.nabble.com>
User-Agent: Mutt/1.4.2.3i
X-Face: *}~{PHnDTzvXPe'wl_-f%!@+r5;
	VLhb':*DsX%wEOPg\fDrXWQJf|2\,92"DdS%63t*BHDyQ|OWo@Gfjcd72eaN!4%NE{0]p)ihQ1MyFNtWL
X-Operating-System: FreeBSD 8.1-RELEASE amd64
X-Organisation: 'shute.org.uk'
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
Reply-To: Frank Shute <frank@shute.org.uk>
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 12:49:13 -0000

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:.*[$]'

That makes mergemaster ignore changes in the CVS tags.

With a good rc and a basic understanding of vi, you should be in good
shape to make progress.

I hated mergemaster when I first started using it but I love it now!

Now I have to learn to love the "mergemaster" that freebsd-update
uses...

Anybody know how to make it ignore CVS tags?


Regards,

-- 

 Frank

 Contact info: http://www.shute.org.uk/misc/contact.html