From owner-freebsd-current@FreeBSD.ORG Mon Jan 19 08:21:46 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B56E916A4FA for ; Mon, 19 Jan 2004 08:21:45 -0800 (PST) Received: from rwcrmhc11.comcast.net (rwcrmhc11.comcast.net [204.127.198.35]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71DD043D49 for ; Mon, 19 Jan 2004 08:21:40 -0800 (PST) (envelope-from rodrigc@crodrigues.org) Received: from h00609772adf0.ne.client2.attbi.com ([66.31.45.197]) by comcast.net (rwcrmhc11) with ESMTP id <20040119162139013007tq5ue>; Mon, 19 Jan 2004 16:21:39 +0000 Received: from h00609772adf0.ne.client2.attbi.com (localhost.crodrigues.org [127.0.0.1])i0JGLeZX037582; Mon, 19 Jan 2004 11:21:41 -0500 (EST) (envelope-from rodrigc@h00609772adf0.ne.client2.attbi.com) Received: (from rodrigc@localhost)i0JGLeOn037581; Mon, 19 Jan 2004 11:21:40 -0500 (EST) (envelope-from rodrigc) Date: Mon, 19 Jan 2004 11:21:40 -0500 From: Craig Rodrigues To: rihad Message-ID: <20040119162140.GA37568@crodrigues.org> References: <400C012E.4040002@mail.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <400C012E.4040002@mail.ru> User-Agent: Mutt/1.4.1i cc: freebsd-current@freebsd.org Subject: Re: question on mergemaster X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2004 16:21:46 -0000 On Mon, Jan 19, 2004 at 08:09:18PM +0400, rihad wrote: > Hi. I was wondering if there are any improvements planned to be made to > mergemaster? After today's cvsup I had to sit and keep pressing either > "q" (to break out of the pager) or "i" to accept the new file. This *is* > boring, considering there seemed to be no end to them and I eventually > killed mergemaster, because I had started to get nervous and make silly > typos :). Read this e-mail by Mike Makonnen which explains what to do in mergemaster in this case: http://lists.freebsd.org/pipermail/freebsd-current/2004-January/018944.html -- Craig Rodrigues http://crodrigues.org rodrigc@crodrigues.org