From owner-freebsd-stable@FreeBSD.ORG  Fri Apr 18 19:12:37 2003
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 358B537B405
	for <freebsd-stable@freebsd.org>;
	Fri, 18 Apr 2003 19:12:37 -0700 (PDT)
Received: from smtp.acd.net (smtp.acd.net [207.179.102.146])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C960843F3F
	for <freebsd-stable@freebsd.org>;
	Fri, 18 Apr 2003 19:12:35 -0700 (PDT)	(envelope-from taxman@ACD.NET)
Received: from 207.179.66.49 ([207.179.66.49]) by smtp.acd.net with Microsoft
	SMTPSVC(5.0.2195.5329);	 Fri, 18 Apr 2003 22:12:46 -0400
From: taxman <taxman@acd.net>
To: "Anton Zavrin" <antonzav@pacbell.net>,
	<freebsd-stable@freebsd.org>
Date: Fri, 18 Apr 2003 22:06:55 -0400
User-Agent: KMail/1.5
References: <00f201c3060c$269db5f0$0200a8c0@travel>
In-Reply-To: <00f201c3060c$269db5f0$0200a8c0@travel>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200304182206.55726.taxman@acd.net>
X-OriginalArrivalTime: 19 Apr 2003 02:13:05.0708 (UTC)
	FILETIME=[36A296C0:01C30619]
Subject: Re: What do you think of mergemaster -i option ?
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Production branch of FreeBSD source code
	<freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Apr 2003 02:12:37 -0000

On Friday 18 April 2003 08:39 pm, Anton Zavrin wrote:
> Yeah, I don't have luck with mergemaster, may be after another 100 times
> I run it I will educate myself to properly use it.

Its not *that* bad.  I can still remember when I had no idea what to do with 
the pile of symbols it flew across the screen.  All you have to do is write 
down or take note of any of the files in /etc that you have modified from the 
defaults.  For every one of those, choose save for later.  For every file 
you've never modified, or is new, just go ahead and install it, the new 
versions will be good for you.  :)

> So, would '-i' option help me to automate the process?

sure, that'll at least take care of all the new files for you.

Tim