From owner-freebsd-stable  Fri May 25 16: 1:36 2001
Delivered-To: freebsd-stable@freebsd.org
Received: from ptavv.es.net (ptavv.es.net [198.128.4.29])
	by hub.freebsd.org (Postfix) with ESMTP id 3804C37B42C
	for <freebsd-stable@FreeBSD.ORG>; Fri, 25 May 2001 16:01:34 -0700 (PDT)
	(envelope-from oberman@ptavv.es.net)
Received: from ptavv.es.net (localhost [127.0.0.1])
	by ptavv.es.net (8.10.1/8.10.1) with ESMTP id f4PN1Xc01257;
	Fri, 25 May 2001 16:01:33 -0700 (PDT)
Message-Id: <200105252301.f4PN1Xc01257@ptavv.es.net>
To: Jim Bayers <bayers@yahoo.com>
Cc: freebsd-stable@FreeBSD.ORG
Subject: Re: Questions. 4.1 to RELENG_4 
In-reply-to: Your message of "Fri, 25 May 2001 15:42:04 PDT."
             <20010525224204.20845.qmail@web11505.mail.yahoo.com> 
Date: Fri, 25 May 2001 16:01:33 -0700
From: "Kevin Oberman" <oberman@es.net>
Sender: owner-freebsd-stable@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-stable.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20freebsd-stable>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20freebsd-stable>
X-Loop: FreeBSD.ORG

> Date: Fri, 25 May 2001 15:42:04 -0700 (PDT)
> From: Jim Bayers <bayers@yahoo.com>
> Sender: owner-freebsd-stable@FreeBSD.ORG
> 
> Also, I got a little confused using mergemaster.  I
> kept selecting 'm=merge' and kept picking the right
> side item--unless I saw something obvious.  At the end
> of the document, I would install.
> 
> I read an article saying that it should go faster,
> what am I doing wrong?

Unless the file is one that you have modified, the normal response to
mergemaster is 'i'. If it is a file you have modified, you will
usually want 'm'. /etc/printcap is about the only file I ever run into
that is I have to worry about merging. 

When you use the merge option, you do want to ALWAYS take the right
entry for the RCS version line. Other than that, take the right unless
it involves a change you have made or have a good reason to do
otherwise.

R. Kevin Oberman, Network Engineer
Energy Sciences Network (ESnet)
Ernest O. Lawrence Berkeley National Laboratory (Berkeley Lab)
E-mail: oberman@es.net			Phone: +1 510 486-8634

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message