From owner-cvs-all Tue Jan 28 12: 6: 2 2003 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7024C37B401; Tue, 28 Jan 2003 12:06:01 -0800 (PST) Received: from dragon.nuxi.com (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB1E243E4A; Tue, 28 Jan 2003 12:06:00 -0800 (PST) (envelope-from obrien@NUXI.com) Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1]) by dragon.nuxi.com (8.12.6/8.12.2) with ESMTP id h0SK5uIx021886; Tue, 28 Jan 2003 12:05:56 -0800 (PST) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.12.6/8.12.6/Submit) id h0SK4eRo021851; Tue, 28 Jan 2003 12:04:40 -0800 (PST) Date: Tue, 28 Jan 2003 12:04:40 -0800 From: "David O'Brien" To: Matthew Dillon Cc: Garance A Drosihn , cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG Subject: Re: cvs commit: src/usr.sbin/mergemaster mergemaster.sh Message-ID: <20030128200440.GA21674@dragon.nuxi.com> Reply-To: obrien@FreeBSD.ORG Mail-Followup-To: David O'Brien , Matthew Dillon , Garance A Drosihn , cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG References: <200301281844.h0SIie3G086935@repoman.freebsd.org> <200301281908.h0SJ8OoY028183@apollo.backplane.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200301281908.h0SJ8OoY028183@apollo.backplane.com> User-Agent: Mutt/1.4i X-Operating-System: FreeBSD 5.0-CURRENT Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tue, Jan 28, 2003 at 11:08:24AM -0800, Matthew Dillon wrote: > > :exactly what I would like, but I'm still trying to figure out > :how I would prefer to see it behave. > : > :-- > :Garance Alistair Drosehn = gad@gilead.netel.rpi.edu > > I'm sure it will get worked out. There really only two issues that > need to be solved (deterministic location of the file name, > deterministic UI i.e. not being left in the pager some times and out of > it other times), and several ways to solve them. Great to hear -- I also like some of the changes you made to mergemaster. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message