From owner-freebsd-questions  Wed Jun 20 17: 5:52 2001
Delivered-To: freebsd-questions@freebsd.org
Received: from web12002.mail.yahoo.com (web12002.mail.yahoo.com [216.136.172.210])
	by hub.freebsd.org (Postfix) with SMTP id 5893837B409
	for <freebsd-questions@FreeBSD.ORG>; Wed, 20 Jun 2001 17:05:45 -0700 (PDT)
	(envelope-from bsd2000au@yahoo.com.au)
Message-ID: <20010621000545.67312.qmail@web12002.mail.yahoo.com>
Received: from [61.9.188.78] by web12002.mail.yahoo.com; Thu, 21 Jun 2001 10:05:45 EST
Date: Thu, 21 Jun 2001 10:05:45 +1000 (EST)
From: =?iso-8859-1?q?Keith=20Spencer?= <bsd2000au@yahoo.com.au>
Subject: Erik you are a gem!->Re: how do I use mergemaster?
To: Erik Trulsson <ertr1013@student.uu.se>
Cc: fbsd <freebsd-questions@FreeBSD.ORG>
In-Reply-To: <20010620072736.A24314@student.uu.se>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
Sender: owner-freebsd-questions@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-questions.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-questions>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20freebsd-questions>
X-Loop: FreeBSD.ORG

Hi Erik/all,
You are legend thanks for the help
Keith

--- Erik Trulsson <ertr1013@student.uu.se> wrote: > On
Wed, Jun 20, 2001 at 09:19:47AM +1000, Keith
> Spencer wrote:
> > Hi Erik and all,
> > Thanks for the help.
> > Trouble is I have chosen h but what does left
> right
> > etc mean? How do I know what to do?
> > e.g. I have changed
> >  rc.conf
> > do I choose left right what?
> > Unclear for me I am afraid.
> > Thanks for your patience
> > Keith
> 
> It displays the lines in the file that differ
> between the file you have
> installed and the new file.
> The left version is the old one you have installed.
> The right version
> is the new one.
> Which one you choose depends on which you want.
> If you have done some modifications to the file then
> you probably want
> the left side for those parts containging those
> modifications.
> 
> You almost alwasy want to update the line containing
> the CVS version.
> (I.e. choose the version on the right.)
> (Usually the first line in the file.)
> This is because mergemaster ignores files having the
> same CVS id even
> if they have different contents. In this way you can
> have files with
> local modifications without mergemaster asking about
> them every time
> you upgrade your system.
> 
> 
> -- 
> <Insert your favourite quote here.>
> Erik Trulsson
> ertr1013@student.uu.se
> 


_____________________________________________________________________________
http://messenger.yahoo.com.au - Yahoo! Messenger
- Voice chat, mail alerts, stock quotes and favourite news and lots more!

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