From owner-cvs-all Sat Jan 25 11:18: 8 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 C7EDD37B401; Sat, 25 Jan 2003 11:18:06 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D78543F13; Sat, 25 Jan 2003 11:18:06 -0800 (PST) (envelope-from dillon@FreeBSD.org) Received: from freefall.freebsd.org (dillon@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h0PJI6NS069133; Sat, 25 Jan 2003 11:18:06 -0800 (PST) (envelope-from dillon@freefall.freebsd.org) Received: (from dillon@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h0PJI6ld069132; Sat, 25 Jan 2003 11:18:06 -0800 (PST) Date: Sat, 25 Jan 2003 11:18:06 -0800 (PST) From: Matt Dillon Message-Id: <200301251918.h0PJI6ld069132@freefall.freebsd.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.sbin/mergemaster mergemaster.sh 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 These changes are the ones that were discussed quite a while ago, a few months ago I think. Generally speaking the end of that discussion was positive towards the patch, but some people still had reservations over not displaying the complete diff | pager initially. But, I'll tell you, I can't live without this patch anymore. I've been using it ever since then and whenever I try to run the old mergemaster now it takes twice as long (or longer) and is extremely frustrating. I think there is far more merit to this patch then those with reservations might have considered. So what I would like people to do is actually *TRY* this mergemaster in their nominal -current environment. Not once, but several times (when changes are presennt), with consideration for a possible MFC to -stable for the next -stable release. It really does make life far, far easier. Suggestions for minor adjustments and improvements are welcome. For example, -current has probably changed enough since you have done your last mergemaster in -current. Try this one now. -Matt :dillon 2003/01/25 11:12:06 PST : : Modified files: : usr.sbin/mergemaster mergemaster.sh : Log: : Commit simple mergemaster changes to make the UI more deterministic : (far easier to use) by limiting the initial display to the size of the : window. : : Revision Changes Path : 1.39 +44 -11 src/usr.sbin/mergemaster/mergemaster.sh To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message