Date: Sat, 25 Jan 2003 11:18:06 -0800 (PST) From: Matt Dillon <dillon@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.sbin/mergemaster mergemaster.sh Message-ID: <200301251918.h0PJI6ld069132@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200301251918.h0PJI6ld069132>