From owner-freebsd-stable@FreeBSD.ORG Sun Apr 20 14:13:06 2003 Return-Path: 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 D9C9137B40D for ; Sun, 20 Apr 2003 14:13:06 -0700 (PDT) Received: from sccrmhc02.attbi.com (sccrmhc02.attbi.com [204.127.202.62]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47E1243FCB for ; Sun, 20 Apr 2003 14:13:06 -0700 (PDT) (envelope-from DougB@freebsd.org) Received: from master.gorean.org (12-234-22-23.client.attbi.com[12.234.22.23]) by sccrmhc02.attbi.com (sccrmhc02) with SMTP id <200304202113050020027dite>; Sun, 20 Apr 2003 21:13:05 +0000 Date: Sun, 20 Apr 2003 14:13:04 -0700 (PDT) From: Doug Barton To: Anton Zavrin In-Reply-To: <00f201c3060c$269db5f0$0200a8c0@travel> Message-ID: <20030420141205.Q631@znfgre.tberna.bet> References: <00f201c3060c$269db5f0$0200a8c0@travel> Organization: http://www.FreeBSD.org/ X-message-flag: Outlook -- Not just for spreading viruses anymore! MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: freebsd-stable@freebsd.org 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Apr 2003 21:13:07 -0000 On Fri, 18 Apr 2003, 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. What kind of problems do you have with it? Have you read the man page? Is there anything in the man page you find confusing? > So, would '-i' option help me to automate the process? I recommend this, yes. Doug -- This .signature sanitized for your protection