From owner-cvs-all Tue Jan 28 11:17:10 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 01C7937B405; Tue, 28 Jan 2003 11:17:09 -0800 (PST) Received: from mail.rpi.edu (mail.rpi.edu [128.113.2.7]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04CBB43F93; Tue, 28 Jan 2003 11:17:08 -0800 (PST) (envelope-from drosih@rpi.edu) Received: from [128.113.24.47] (gilead.netel.rpi.edu [128.113.24.47]) by mail.rpi.edu (8.12.1/8.12.1) with ESMTP id h0SJH4PH184442; Tue, 28 Jan 2003 14:17:04 -0500 Mime-Version: 1.0 X-Sender: drosih@mail.rpi.edu Message-Id: In-Reply-To: <200301281908.h0SJ8OoY028183@apollo.backplane.com> References: <200301281844.h0SIie3G086935@repoman.freebsd.org> <200301281908.h0SJ8OoY028183@apollo.backplane.com> Date: Tue, 28 Jan 2003 14:17:02 -0500 To: Matthew Dillon From: Garance A Drosihn Subject: Re: cvs commit: src/usr.sbin/mergemaster mergemaster.sh Cc: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG Content-Type: text/plain; charset="us-ascii" ; format="flowed" X-Scanned-By: MIMEDefang 2.3 (www dot roaringpenguin dot com slash mimedefang) 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 At 11:08 AM -0800 1/28/03, 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. Well for one thing, if a given file has a lot of changes, then I would like mergemaster to skip over the initial one-line change that only tells me how some comment now has a new version-number in it. Chances are mighty good that the cvs-ID comment tells me nothing that helps me decide what I want to do, and it wastes five or six valuable lines on the screen. -- Garance Alistair Drosehn = gad@gilead.netel.rpi.edu Senior Systems Programmer or gad@freebsd.org Rensselaer Polytechnic Institute or drosih@rpi.edu To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message